diff --git a/Meshtastic/Views/Settings/Config/SecurityConfig.swift b/Meshtastic/Views/Settings/Config/SecurityConfig.swift
index 5e6dbb18..e0e501c5 100644
--- a/Meshtastic/Views/Settings/Config/SecurityConfig.swift
+++ b/Meshtastic/Views/Settings/Config/SecurityConfig.swift
@@ -149,9 +149,11 @@ struct SecurityConfig: View {
 			}
 			hasChanges = true
 		}
-		.onChange(of: adminKey) { _ in
-			let tempAdminKey = Data(base64Encoded: adminKey) ?? Data()
-			if tempAdminKey.count == 0 || tempAdminKey.count == 32 {
+		.onChange(of: adminKey) { key in
+			let tempKey = Data(base64Encoded: key) ?? Data()
+			if key.isEmpty {
+				hasValidAdminKey = true
+			} else if tempKey.count == 32 {
 				hasValidAdminKey = true
 			} else {
 				hasValidAdminKey = false