diff --git a/Meshtastic/Helpers/TAK/TAKServerManager.swift b/Meshtastic/Helpers/TAK/TAKServerManager.swift
index 94b2c7b2..c759d52e 100644
--- a/Meshtastic/Helpers/TAK/TAKServerManager.swift
+++ b/Meshtastic/Helpers/TAK/TAKServerManager.swift
@@ -585,7 +585,10 @@ final class TAKServerManager: ObservableObject {
 			}
 
 			let newKey = generateChannelKey(size: 32)
-			let newPsk = Data(base64Encoded: newKey) ?? Data()
+			guard let newPsk = Data(base64Encoded: newKey) else {
+				Logger.tak.error("Failed to decode generated channel key; aborting primary channel fix")
+				return false
+			}
 
 			primaryChannel.name = "TAK"
 			primaryChannel.psk = newPsk