diff --git a/ampel-firmware/web_server.cpp b/ampel-firmware/web_server.cpp
index 42c5fafce7dbdffc784462bf985fe724cd134de3..395c9b274a5430b92f76b0e974867b2bad6cc809 100644
--- a/ampel-firmware/web_server.cpp
+++ b/ampel-firmware/web_server.cpp
@@ -75,7 +75,8 @@ namespace web_server {
 # else
     iotWebConf->setStatusPin(ONBOARD_LED_PIN, HIGH);
 # endif
-    //TODO: Disable AP if WiFi connects
+    iotWebConf->setWifiConnectionTimeoutMs(1000UL * WIFI_TIMEOUT);
+    iotWebConf->skipApStartup();
     //TODO: Add callbacks
     //TODO: Add LED effects
     //TODO: Add other params