diff --git a/main/main.ino b/main/main.ino
index 15d24f9..03ffc98 100644
--- a/main/main.ino
+++ b/main/main.ino
@@ -828,25 +828,30 @@ void loop()
   //MQTT client connexion management
   if (!client.connected()) { // not connected
     if (now - lastReconnectAttempt > 5000) {
+      trc("client disconnected");
       lastReconnectAttempt = now;
       // Attempt to reconnect
-      if (reconnect()) {
-        lastReconnectAttempt = 0;
-      } else {
-        #if defined(ESPWifiManualSetup)
-          trc(F("restarting ESP"));
-          #ifdef ESP32
-            ESP.restart();
+      if (WiFi.status() == WL_CONNECTED){
+        if (reconnect()) {
+          lastReconnectAttempt = 0;
+        } else {
+          #if defined(ESPWifiManualSetup)
+            trc(F("restarting ESP"));
+            #ifdef ESP32
+              ESP.restart();
+            #endif
+            #ifdef ESP8266
+              ESP.reset();
+            #endif
+          #elif defined(ESP8266) || defined(ESP32)
+            if (!connectedOnce) {
+              trc(F("reseting wifi manager"));
+              setup_wifimanager(true); // if we didn't connected once to mqtt we reset and start in AP mode again to have a chance to change the parameters
+            }
           #endif
-          #ifdef ESP8266
-            ESP.reset();
-          #endif
-        #elif defined(ESP8266) || defined(ESP32)
-          if (!connectedOnce) {
-            trc(F("reseting wifi manager"));
-            setup_wifimanager(true); // if we didn't connected once to mqtt we reset and start in AP mode again to have a chance to change the parameters
-          }
-        #endif
+        }
+      }else{
+        trc("wifi disconnected");
       }
     }
   } else { //connected