diff --git a/app/models/domain.rb b/app/models/domain.rb
index ceff9e810..f21317b70 100644
--- a/app/models/domain.rb
+++ b/app/models/domain.rb
@@ -485,9 +485,9 @@ class Domain < ApplicationRecord
             self.delete_date = nil
           when DomainStatus::SERVER_MANUAL_INZONE # removal causes server hold to set
             self.outzone_at = Time.zone.now if force_delete_scheduled?
-          when DomainStatus::DomainStatus::EXPIRED # removal causes server hold to set
+          when DomainStatus::EXPIRED # removal causes server hold to set
             self.outzone_at = self.expire_time + 15.day
-          when DomainStatus::DomainStatus::SERVER_HOLD # removal causes server hold to set
+          when DomainStatus::SERVER_HOLD # removal causes server hold to set
             self.outzone_at = nil
         end
       end
diff --git a/test/system/admin_area/domains_test.rb b/test/system/admin_area/domains_test.rb
index abd1d93fb..05e7d60f3 100644
--- a/test/system/admin_area/domains_test.rb
+++ b/test/system/admin_area/domains_test.rb
@@ -35,4 +35,15 @@ class AdminDomainsTestTest < ApplicationSystemTestCase
     assert_text 'deleteCandidate status has been removed'
     assert_no_link 'Remove deleteCandidate status'
   end
+
+  def test_remove_domain_status
+    @domain.update!(statuses: [DomainStatus::SERVER_REGISTRANT_CHANGE_PROHIBITED])
+
+    visit edit_admin_domain_url(@domain)
+
+    click_link_or_button 'Delete'
+    click_link_or_button 'Save'
+
+    assert_text 'Domain updated!'
+  end
 end