diff --git a/changelog/20375.txt b/changelog/20375.txt
new file mode 100644
index 000000000..92caf1e57
--- /dev/null
+++ b/changelog/20375.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+core: prevent panic on login after namespace is deleted that had mfa enforcement
+```
\ No newline at end of file
diff --git a/vault/login_mfa.go b/vault/login_mfa.go
index 9a2109831..780c1fe39 100644
--- a/vault/login_mfa.go
+++ b/vault/login_mfa.go
@@ -1788,7 +1788,8 @@ ECONFIG_LOOP:
 		if err != nil {
 			return nil, fmt.Errorf("failed to find the MFAEnforcementConfig namespace")
 		}
-		if eConfig == nil || (eConfigNS.ID != ns.ID && !ns.HasParent(eConfigNS)) {
+
+		if eConfig == nil || eConfigNS == nil || (eConfigNS.ID != ns.ID && !ns.HasParent(eConfigNS)) {
 			continue
 		}