diff --git a/app/models/domain.rb b/app/models/domain.rb
index 53f0fa5b6..a11f50f40 100644
--- a/app/models/domain.rb
+++ b/app/models/domain.rb
@@ -492,7 +492,7 @@ class Domain < ApplicationRecord
 
   # depricated not used, not valid
   def update_prohibited?
-    pending_update_prohibited? && pending_delete_prohibited?
+    (statuses & DomainStatus::UPDATE_PROHIBIT_STATES).present?
   end
 
   # public api
diff --git a/app/models/tech_domain_contact.rb b/app/models/tech_domain_contact.rb
index 20f21b6ed..eff815350 100644
--- a/app/models/tech_domain_contact.rb
+++ b/app/models/tech_domain_contact.rb
@@ -6,7 +6,7 @@ class TechDomainContact < DomainContact
     tech_contacts = where(contact: current_contact)
 
     tech_contacts.each do |tech_contact|
-      if tech_contact.domain.bulk_update_prohibited?
+      if irreplaceable?(tech_contact)
         skipped_domains << tech_contact.domain.name
         next
       end
@@ -20,4 +20,9 @@ class TechDomainContact < DomainContact
     end
     [affected_domains.sort, skipped_domains.sort]
   end
+
+  def self.irreplaceable?(tech_contact)
+    dn = tech_contact.domain
+    dn.bulk_update_prohibited? || dn.update_prohibited? || dn.tech_change_prohibited?
+  end
 end