diff --git a/src/mqtt/MQTT.cpp b/src/mqtt/MQTT.cpp
index ad35e152a..2dcfd80e1 100644
--- a/src/mqtt/MQTT.cpp
+++ b/src/mqtt/MQTT.cpp
@@ -692,7 +692,7 @@ void MQTT::publishNodeInfo()
 }
 void MQTT::publishQueuedMessages()
 {
-    if (mqttQueue.isEmpty())
+    if (mqttQueue.isEmpty() || !isConnected)
         return;
 
     if (!moduleConfig.mqtt.proxy_to_client_enabled && !isConnected)