diff --git a/main/User_config.h b/main/User_config.h
index 7bd73482bf..a0831769b3 100644
--- a/main/User_config.h
+++ b/main/User_config.h
@@ -127,8 +127,8 @@ const byte mac[] = {0xDE, 0xED, 0xBA, 0xFE, 0x54, 0x95}; //W5100 ethernet shield
 #ifndef WifiManager_ConfigPortalTimeOut
 #  define WifiManager_ConfigPortalTimeOut 240 //time in seconds for the setup portal to stay open, default 240s
 #endif
-#ifndef WifiManager_TimeOut
-#  define WifiManager_TimeOut 5
+#ifndef WiFi_TimeOut
+#  define WiFi_TimeOut 5
 #endif
 #ifndef WM_DEBUG_LEVEL
 #  define WM_DEBUG_LEVEL 1 // valid values are: DEBUG_ERROR = 0, DEBUG_NOTIFY = 1, DEBUG_VERBOSE = 2, DEBUG_DEV = 3, DEBUG_MAX = 4
diff --git a/main/main.ino b/main/main.ino
index caf1c5c941..af2ff6e398 100644
--- a/main/main.ino
+++ b/main/main.ino
@@ -1606,7 +1606,7 @@ void setup_wifimanager(bool reset_settings) {
   //WiFiManager
   //Local intialization. Once its business is done, there is no need to keep it around
 
-  wifiManager.setConnectTimeout(WifiManager_TimeOut);
+  wifiManager.setConnectTimeout(WiFi_TimeOut);
   //Set timeout before going to portal
   wifiManager.setConfigPortalTimeout(WifiManager_ConfigPortalTimeOut);
 
@@ -2691,7 +2691,7 @@ void MQTTtoSYS(char* topicOri, JsonObject& SYSdata) { // json object decoding
 #  if (defined(ESP8266) || defined(ESP32)) && (defined(WifiGMode) || defined(WifiPower))
       setESPWifiProtocolTxPower();
 #  endif
-      WiFi.waitForConnectResult();
+      WiFi.waitForConnectResult(WiFi_TimeOut * 1000);
 
       if (WiFi.status() != WL_CONNECTED) {
         Log.error(F("Failed to connect to new AP; falling back" CR));