diff --git a/Network.cpp b/Network.cpp
index 8bdf533..e8432f8 100644
--- a/Network.cpp
+++ b/Network.cpp
@@ -354,6 +354,8 @@ bool Network::connectWiFi() {
     Serial.print("Set hostname to:");
     Serial.println(WiFi.getHostname());
     WiFi.mode(WIFI_STA);
+    WiFi.setScanMethod(WIFI_ALL_CHANNEL_SCAN);
+    WiFi.setSortMethod(WIFI_CONNECT_AP_BY_SIGNAL);
     WiFi.begin(settings.WIFI.ssid, settings.WIFI.passphrase);
     delay(100);
     int retries = 0;
diff --git a/SomfyController.ino.esp32.bin b/SomfyController.ino.esp32.bin
index 8f6a9ad..c4869a4 100644
Binary files a/SomfyController.ino.esp32.bin and b/SomfyController.ino.esp32.bin differ
diff --git a/SomfyController.ino.esp32s3.bin b/SomfyController.ino.esp32s3.bin
index b082c2d..79d63f8 100644
Binary files a/SomfyController.ino.esp32s3.bin and b/SomfyController.ino.esp32s3.bin differ