diff --git a/src/registrar/templates/domain_security_email.html b/src/registrar/templates/domain_security_email.html
index 4054186da..e1755f85e 100644
--- a/src/registrar/templates/domain_security_email.html
+++ b/src/registrar/templates/domain_security_email.html
@@ -20,7 +20,7 @@
     <button
       type="submit"
       class="usa-button"
-    >{% if form.security_email.value is None or form.security_email.value == "dotgov@cisa.dhs.gov"%}Add security email{% else %}Save{% endif %}</button>
+    >{% if form.security_email.value is None or form.security_email.value == "dotgov@cisa.dhs.gov" or form.security_email.value == "registrar@dotgov.gov"%}Add security email{% else %}Save{% endif %}</button>
   </form>
 
 {% endblock %}  {# domain_content #}
diff --git a/src/registrar/utility/csv_export.py b/src/registrar/utility/csv_export.py
index 52afb218b..3924c03c4 100644
--- a/src/registrar/utility/csv_export.py
+++ b/src/registrar/utility/csv_export.py
@@ -38,7 +38,7 @@ def write_row(writer, columns, domain_info):
     if security_contacts:
         security_email = security_contacts[0].email
 
-    invalid_emails = {"registrar@dotgov.gov"}
+    invalid_emails = {"registrar@dotgov.gov", "dotgov@cisa.dhs.gov"}
     # These are default emails that should not be displayed in the csv report
     if security_email is not None and security_email.lower() in invalid_emails:
         security_email = "(blank)"
diff --git a/src/registrar/views/domain.py b/src/registrar/views/domain.py
index 4d47a6f59..f3e0a3b9d 100644
--- a/src/registrar/views/domain.py
+++ b/src/registrar/views/domain.py
@@ -568,7 +568,9 @@ class DomainSecurityEmailView(DomainFormBaseView):
         """The initial value for the form."""
         initial = super().get_initial()
         security_contact = self.object.security_contact
-        if security_contact is None or security_contact.email == "dotgov@cisa.dhs.gov":
+
+        invalid_emails = ["dotgov@cisa.dhs.gov", "registrar@dotgov.gov"]
+        if security_contact is None or security_contact.email in invalid_emails:
             initial["security_email"] = None
             return initial
         initial["security_email"] = security_contact.email