diff --git a/app/models/domain.rb b/app/models/domain.rb
index dc6187eaa..23228a20e 100644
--- a/app/models/domain.rb
+++ b/app/models/domain.rb
@@ -566,6 +566,10 @@ class Domain < ActiveRecord::Base
     statuses.include?(DomainStatus::PENDING_UPDATE)
   end
 
+  def update_prohibited?
+    pending_update_prohibited? && pending_delete_prohibited?
+  end
+
   # TODO: Review the list and disallow epp calls
   def pending_update_prohibited?
     (statuses & [
diff --git a/app/models/epp/domain.rb b/app/models/epp/domain.rb
index a11e6152b..e89c62dcb 100644
--- a/app/models/epp/domain.rb
+++ b/app/models/epp/domain.rb
@@ -4,7 +4,7 @@ class Epp::Domain < Domain
 
   before_validation :manage_permissions
   def manage_permissions
-    return unless pending_update? || pending_delete?
+    return unless update_prohibited?
     add_epp_error('2304', nil, nil, I18n.t(:object_status_prohibits_operation))
     false
   end