diff --git a/ampel-firmware/wifi_util.cpp b/ampel-firmware/wifi_util.cpp
index 5dcacfb4738e2ef50758be65d7e5b823a755a069..915445faf21a3f4554aaee87764f26af8789ba95 100644
--- a/ampel-firmware/wifi_util.cpp
+++ b/ampel-firmware/wifi_util.cpp
@@ -20,9 +20,16 @@ namespace wifi {
   }
 
   void tryConnection() {
-    for (int i = 0; i <= 30 && !connected(); i++) {
-      led_effects::showRainbowWheel();
+    //TODO: configurable timeout
+    for (int i = 0; i <= 30; i++) {
       web_config::update();
+      if (connected()) {
+        break;
+      } else if (WiFi.status() == WL_NO_SHIELD) { // Access point, apparently
+        led_effects::showKITTWheel(0xFF0015, 1);
+      } else {
+        led_effects::showRainbowWheel();
+      }
       Serial.print(".");
     }
   }