diff --git a/main/User_config.h b/main/User_config.h
index df73eb8..3ac82d2 100644
--- a/main/User_config.h
+++ b/main/User_config.h
@@ -694,8 +694,10 @@ void storeSignalValue(uint64_t);
 #    ifndef JSON_BLE_AES_CUSTOM_KEYS
 #      define JSON_BLE_AES_CUSTOM_KEYS 256 // 42 byte BLE Custom Key * 6 rounded up to 256.
 #    endif
+// Runtime default for ble_aes[]. Empty = no default; override at build time
+// with -DBLE_AES='"<32-hex-key>"' to ship a stock key.
 #    ifndef BLE_AES
-#      define BLE_AES "00112233445566778899001122334455"
+#      define BLE_AES ""
 #    endif
 #  endif
 #endif
diff --git a/main/config_WebContent.h b/main/config_WebContent.h
index a535c2d..11d0369 100644
--- a/main/config_WebContent.h
+++ b/main/config_WebContent.h
@@ -294,8 +294,7 @@ const char config_ble_body_decoder[] =
 const char config_ble_body_encrypt[] =
     "<hr><p><b>Encryption</b></p>"
     "<p><b>BLE AES Default Key (32 char hex)</b></p>"
-    "<input id='bk' name='bk' minlength='32' maxlength='32' placeholder=" BLE_AES
-    " value='%s'>"
+    "<input id='bk' name='bk' minlength='32' maxlength='32' placeholder='00112233445566778899001122334455' value='%s'>"
     "<hr><p><b>BLE Key Pairs</b></p>"
     "<p>MacAddress:AESKey with space separator</p>"
     "<p><textarea id='kp' name='kp' placeholder='A4C138012345:00112233445566778899001122334455' rows='3' cols='46'>%s</textarea></p>";
diff --git a/main/gatewayBT.cpp b/main/gatewayBT.cpp
index 02def11..1f4bf0c 100644
--- a/main/gatewayBT.cpp
+++ b/main/gatewayBT.cpp
@@ -1275,9 +1275,14 @@ void process_bledata(JsonObject& BLEdata) {
     if (ble_aes_keys.containsKey(macWOdots)) {
       THEENGS_LOG_TRACE(F("[BLEDecryptor] Custom AES key %s" CR), ble_aes_keys[macWOdots].as<const char*>());
       bleaeskeylength = hexToBytes(ble_aes_keys[macWOdots], bleaeskey, 16);
-    } else {
+    } else if (strlen(ble_aes) >= 32) {
       THEENGS_LOG_TRACE(F("[BLEDecryptor] Default AES key" CR));
       bleaeskeylength = hexToBytes(ble_aes, bleaeskey, 16);
+    } else {
+      // No per-MAC key configured and no default set: skip silently rather
+      // than attempting decryption with a placeholder key.
+      THEENGS_LOG_TRACE(F("[BLEDecryptor] No AES key configured for %s, skipping" CR), macWOdots.c_str());
+      return;
     }
     // Check AES Key
     if (bleaeskeylength != 16) {
diff --git a/main/main.cpp b/main/main.cpp
index bf37052..ace2afd 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -96,6 +96,10 @@ char gateway_name[parameters_size + 1] = Gateway_Name;
 unsigned long lastDiscovery = 0;
 
 #if BLEDecryptor
+// BLE_AES defaults to "" (see User_config.h) so encrypted PVVX/BTHome/Victron
+// frames are only decrypted when a per-MAC key is configured (ble_aes_keys) or
+// the user enters a default. Sites shipping a stock default key can still set
+// it at build time via -DBLE_AES='"<32-hex-key>"'.
 char ble_aes[parameters_size] = BLE_AES;
 StaticJsonDocument<JSON_BLE_AES_CUSTOM_KEYS> ble_aes_keys;
 #endif