diff --git a/src/mesh/Router.cpp b/src/mesh/Router.cpp
index 66e21d21d..4f60360ce 100644
--- a/src/mesh/Router.cpp
+++ b/src/mesh/Router.cpp
@@ -222,28 +222,30 @@ ErrorCode Router::send(MeshPacket *p)
         ChannelIndex chIndex = p->channel; // keep as a local because we are about to change it
 
 #if HAS_WIFI || HAS_ETHERNET
-        // check if we should send decrypted packets to mqtt
+        if(moduleConfig.mqtt.enabled) {
+            // check if we should send decrypted packets to mqtt
 
-        // truth table:
-        /* mqtt_server  mqtt_encryption_enabled should_encrypt
-         *    not set                        0              1
-         *    not set                        1              1
-         *        set                        0              0
-         *        set                        1              1
-         *
-         * => so we only decrypt mqtt if they have a custom mqtt server AND mqtt_encryption_enabled is FALSE
-         */
+            // truth table:
+            /* mqtt_server  mqtt_encryption_enabled should_encrypt
+            *    not set                        0              1
+            *    not set                        1              1
+            *        set                        0              0
+            *        set                        1              1
+            *
+            * => so we only decrypt mqtt if they have a custom mqtt server AND mqtt_encryption_enabled is FALSE
+            */
 
-        bool shouldActuallyEncrypt = true;
-        if (*moduleConfig.mqtt.address && !moduleConfig.mqtt.encryption_enabled) {
-            shouldActuallyEncrypt = false;
+            bool shouldActuallyEncrypt = true;
+            if (*moduleConfig.mqtt.address && !moduleConfig.mqtt.encryption_enabled) {
+                shouldActuallyEncrypt = false;
+            }
+
+            DEBUG_MSG("Should encrypt MQTT?: %d\n", shouldActuallyEncrypt);
+
+            // the packet is currently in a decrypted state.  send it now if they want decrypted packets
+            if (mqtt && !shouldActuallyEncrypt)
+                mqtt->onSend(*p, chIndex);
         }
-
-        DEBUG_MSG("Should encrypt MQTT?: %d\n", shouldActuallyEncrypt);
-
-        // the packet is currently in a decrypted state.  send it now if they want decrypted packets
-        if (mqtt && !shouldActuallyEncrypt)
-            mqtt->onSend(*p, chIndex);
 #endif
 
         auto encodeResult = perhapsEncode(p);
@@ -253,10 +255,12 @@ ErrorCode Router::send(MeshPacket *p)
         }
 
 #if HAS_WIFI || HAS_ETHERNET
-        // the packet is now encrypted.
-        // check if we should send encrypted packets to mqtt
-        if (mqtt && shouldActuallyEncrypt)
-            mqtt->onSend(*p, chIndex);
+        if(moduleConfig.mqtt.enabled) {
+            // the packet is now encrypted.
+            // check if we should send encrypted packets to mqtt
+            if (mqtt && shouldActuallyEncrypt)
+                mqtt->onSend(*p, chIndex);
+        }
 #endif
     }