diff --git a/Code/Arduino/AmsToMqttBridge/AmsToMqttBridge.ino b/Code/Arduino/AmsToMqttBridge/AmsToMqttBridge.ino
index b07151eb..a22e93c1 100644
--- a/Code/Arduino/AmsToMqttBridge/AmsToMqttBridge.ino
+++ b/Code/Arduino/AmsToMqttBridge/AmsToMqttBridge.ino
@@ -114,6 +114,10 @@ void setupWiFi()
 	// Connect to WiFi
 	WiFi.begin(ap.config.ssid, ap.config.ssidPassword);
 	
+	while (WiFi.status() != WL_CONNECTED) {
+		delay(500);
+	}
+	
 	// Initialize WiFi and MQTT clients
 	if (ap.config.isSecure())
 		client = new WiFiClientSecure();