diff --git a/sonoff/xdrv_interface.ino b/sonoff/xdrv_interface.ino
index c80bb27d4..a6e917a83 100644
--- a/sonoff/xdrv_interface.ino
+++ b/sonoff/xdrv_interface.ino
@@ -249,6 +249,9 @@ boolean XdrvCall(byte Function)
   boolean result = false;
 
   for (byte x = 0; x < xdrv_present; x++) {
+    if (!((WL_CONNECTED == WiFi.status()) && (static_cast<uint32_t>(WiFi.localIP()) != 0))) {
+      delay(1);
+    }
     result = xdrv_func_ptr[x](Function);
     if (result) break;
   }