diff --git a/src/wifi.cpp b/src/wifi.cpp
index 1fa2bcf..5cfada1 100644
--- a/src/wifi.cpp
+++ b/src/wifi.cpp
@@ -6,10 +6,20 @@
 void wifi_setup() {
 	WiFi.mode(WIFI_STA);
 	WiFi.begin(WIFI_SSID, WIFI_PASS);
-	while (WiFi.waitForConnectResult() != WL_CONNECTED) {
-		Serial.println("WiFi * Connection Failed! Rebooting...");
-		delay(5000);
-		ESP.restart();
+	uint8_t result;
+	uint8_t counter = 0;
+	while ((result = WiFi.waitForConnectResult()) != WL_CONNECTED) {
+		counter++;
+		if (counter > 100) {
+			Serial.print("WiFi * Connection Failed! Last result was: ");
+			Serial.print(result);
+			Serial.println(" Rebooting...");
+			delay(100);
+			ESP.restart();
+		}
+		Serial.print("WiFi * Still waiting for WiFi to connect. This is loop number ");
+		Serial.println(counter);
+		delay(100);
 	}
 	Serial.println("WiFi * Ready");
 	Serial.print("WiFi * IP address: ");