diff --git a/app/models/notification.rb b/app/models/notification.rb
index e83b2c9da..07e824367 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -25,6 +25,10 @@ class Notification < ApplicationRecord
     ''
   end
 
+  def registry_lock?
+    text.include?('has been locked') || text.include?('has been unlocked')
+  end
+
   private
 
   def set_defaults
diff --git a/app/views/epp/poll/poll_req.xml.builder b/app/views/epp/poll/poll_req.xml.builder
index 664327dae..a58b082c5 100644
--- a/app/views/epp/poll/poll_req.xml.builder
+++ b/app/views/epp/poll/poll_req.xml.builder
@@ -15,12 +15,22 @@ xml.epp_head do
       end if @object
     end
 
-    if @notification.action&.contact
-      render(partial: 'epp/poll/action',
-             locals: {
-               builder: xml,
-               action: @notification.action
-             })
+    if @notification.action&.contact || @notification.registry_lock?
+      if @notification.registry_lock?
+        state = @notification.text.include?('unlocked') ? 'unlock' : 'lock'
+        xml.extension do
+          xml.tag!('changePoll:changeData',
+                   'xmlns:changePoll': 'https://epp.tld.ee/schema/changePoll-1.0.xsd') do
+            xml.tag!('changePoll:operation', state)
+          end
+        end
+      else
+        render(partial: 'epp/poll/action',
+               locals: {
+                 builder: xml,
+                 action: @notification.action,
+               })
+      end
     end
 
     render('epp/shared/trID', builder: xml)