diff --git a/app/models/epp/domain.rb b/app/models/epp/domain.rb
index d434c843c..397a55f7a 100644
--- a/app/models/epp/domain.rb
+++ b/app/models/epp/domain.rb
@@ -187,7 +187,7 @@ class Epp::Domain < Domain
     self.period = period
     self.period_unit = unit
 
-    statuses.delete(DomainStatus::SERVER_HOLD)
+    statuses.delete(DomainStatus::SERVER_HOLD) if self.status_notes["serverHold"].empty?
     statuses.delete(DomainStatus::EXPIRED)
     cancel_pending_delete