diff --git a/src/registrar/admin.py b/src/registrar/admin.py
index cee922770..1c7ff4c87 100644
--- a/src/registrar/admin.py
+++ b/src/registrar/admin.py
@@ -1750,9 +1750,10 @@ class DomainAdmin(ListHeaderAdmin):
             if domain is not None and hasattr(domain, "domain_info"):
                 extra_context["original_object"] = domain.domain_info
 
+            extra_context["state_help_message"] = Domain.State.get_admin_help_text(domain.state)
+
             # Pass in what the an extended expiration date would be for the expiration date modal
             extra_context = self._set_expiration_date_context(domain, extra_context)
-            extra_context["state_help_message"] = Domain.State.get_admin_help_text(domain.state)
 
         return super().changeform_view(request, object_id, form_url, extra_context)
 
diff --git a/src/registrar/models/domain.py b/src/registrar/models/domain.py
index 448630cc8..7f53bb234 100644
--- a/src/registrar/models/domain.py
+++ b/src/registrar/models/domain.py
@@ -1779,8 +1779,7 @@ class Domain(TimeStampedModel, DomainHelper):
             self._update_hosts_and_contacts(cleaned, fetch_hosts, fetch_contacts)
 
             if self.state == self.State.UNKNOWN:
-                # self._fix_unknown_state(cleaned)
-                pass
+                self._fix_unknown_state(cleaned)
             if fetch_hosts:
                 self._update_hosts_and_ips_in_db(cleaned)
             if fetch_contacts: