diff --git a/include/defaults.h b/include/defaults.h
index e783df2dc..0070e09cb 100644
--- a/include/defaults.h
+++ b/include/defaults.h
@@ -13,7 +13,7 @@
 #define AUTH_USERNAME "admin"
 #define SECURITY_ALLOW_READONLY true
 
-#define WIFI_RECONNECT_TIMEOUT 15
+#define WIFI_RECONNECT_TIMEOUT 30
 #define WIFI_RECONNECT_REDO_TIMEOUT 600
 
 #define WIFI_SSID ""
diff --git a/src/NetworkSettings.cpp b/src/NetworkSettings.cpp
index 92a3156dc..c8004f169 100644
--- a/src/NetworkSettings.cpp
+++ b/src/NetworkSettings.cpp
@@ -268,7 +268,8 @@ void NetworkSettingsClass::applyConfig()
         MessageOutput.print("new credentials... ");
         WiFi.begin(
             Configuration.get().WiFi.Ssid,
-            Configuration.get().WiFi.Password);
+            Configuration.get().WiFi.Password,
+            WIFI_ALL_CHANNEL_SCAN);
     } else {
         MessageOutput.print("existing credentials... ");
         WiFi.begin();