diff --git a/ampel-firmware/web_server.cpp b/ampel-firmware/web_server.cpp
index b9fba1b864c64f7c41b8958687a42ffc119ed017..fd0213cfbc861376a8cafc50f355ced282a254e5 100644
--- a/ampel-firmware/web_server.cpp
+++ b/ampel-firmware/web_server.cpp
@@ -79,6 +79,8 @@ namespace web_server {
 # endif
     iotWebConf->setWifiConnectionTimeoutMs(1000UL * WIFI_TIMEOUT);
 
+    WiFi.setHostname(ampel.sensorId);
+
     iotWebConf->setWifiConnectionCallback([]() {
       led_effects::showKITTWheel(color::green);
       Serial.println();
@@ -120,6 +122,8 @@ namespace web_server {
     //TODO: Use HTTP_USER / HTTP_PASSWORD for config
     //TODO: Move to own class
     //TODO: Remove AP Password config?
+    //TODO: Save LoRaWAN key if possible?
+    //FIXME: Why does MQTT fail?
     iotWebConf->init();
 
     sensor_console::defineCommand("reset_config", []() {