diff --git a/config_allfeatures.cmake b/config_allfeatures.cmake
index 5f8e1f2..6501142 100644
--- a/config_allfeatures.cmake
+++ b/config_allfeatures.cmake
@@ -119,6 +119,5 @@ set(BOBBYCAR_BUILDFLAGS
   -DOLD_NVS
   -DFEATURE_DNS_NS
   -DSWITCH_BLINK
-  -DFEATURE_IS_MIR_EGAL_OB_DER_WEBSERVER_FUNKTIONIERT
   -DFEATURE_ESPNOW
 )
diff --git a/config_comred.cmake b/config_comred.cmake
index b88e761..ea8bd84 100644
--- a/config_comred.cmake
+++ b/config_comred.cmake
@@ -119,7 +119,7 @@ set(BOBBYCAR_BUILDFLAGS
   -DOLD_NVS
   -DFEATURE_DNS_NS
   -DSWITCH_BLINK
-#  -DFEATURE_IS_MIR_EGAL_OB_DER_WEBSERVER_FUNKTIONIERT
+  -DFEATURE_IS_MIR_EGAL_OB_DER_WEBSERVER_KORREKT_ARBEITET
   -DFEATURE_ESPNOW
 )
 
diff --git a/config_feedc0de.cmake b/config_feedc0de.cmake
index 8315f78..e4bae9f 100644
--- a/config_feedc0de.cmake
+++ b/config_feedc0de.cmake
@@ -100,6 +100,5 @@ set(BOBBYCAR_BUILDFLAGS
   -DOLD_NVS
 #  -DFEATURE_DNS_NS
 #  -DSWITCH_BLINK
-  -DFEATURE_IS_MIR_EGAL_OB_DER_WEBSERVER_FUNKTIONIERT
 #  -DFEATURE_ESPNOW
 )
diff --git a/config_nofeatures.cmake b/config_nofeatures.cmake
index 4477dcd..07da662 100644
--- a/config_nofeatures.cmake
+++ b/config_nofeatures.cmake
@@ -119,6 +119,6 @@ set(BOBBYCAR_BUILDFLAGS
   -DOLD_NVS
 #  -DFEATURE_DNS_NS
 #  -DSWITCH_BLINK
-#  -DFEATURE_IS_MIR_EGAL_OB_DER_WEBSERVER_FUNKTIONIERT
+  -DFEATURE_IS_MIR_EGAL_OB_DER_WEBSERVER_KORREKT_ARBEITET
 #  -DFEATURE_ESPNOW
 )
diff --git a/config_peter.cmake b/config_peter.cmake
index b8974bf..b92556b 100644
--- a/config_peter.cmake
+++ b/config_peter.cmake
@@ -99,6 +99,7 @@ set(BOBBYCAR_BUILDFLAGS
   -DOLD_NVS
   -DFEATURE_DNS_NS
   -DFEATURE_ESPNOW
+  -DFEATURE_IS_MIR_EGAL_OB_DER_WEBSERVER_KORREKT_ARBEITET
 )
 
 if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/ignore/lockscreen_plugin.cmake")
diff --git a/main/newsettings.h b/main/newsettings.h
index c9db2b9..6745606 100644
--- a/main/newsettings.h
+++ b/main/newsettings.h
@@ -57,7 +57,7 @@ public:
     //                                            default                                 allowReset constraints                 nvsName
     ConfigWrapper<std::optional<mac_t>> baseMacAddressOverride{std::nullopt,              NoReset,   {},                         "baseMacAddrOver"     };
     ConfigWrapper<std::string> hostname           {defaultHostname,                       DoReset,   StringMinMaxSize<4, 32>,    "hostname"            };
-    ConfigWrapper<bool>        wifiStaEnabled     {true,                                   DoReset,   {},                         "wifi_enabled"        };
+    ConfigWrapper<bool>        wifiStaEnabled     {true,                                  DoReset,   {},                         "wifi_enabled"        };
     std::array<WiFiConfig, 10> wifi_configs {
         WiFiConfig {"wifi_ssid0", "wifi_key0", "wifi_usestatic0", "wifi_static_ip0", "wifi_stati_sub0", "wifi_stat_gate0", "wifi_usestadns0", "wifi_stat_dnsA0", "wifi_stat_dnsB0", "wifi_stat_dnsC0"},
         WiFiConfig {"wifi_ssid1", "wifi_key1", "wifi_usestatic1", "wifi_static_ip1", "wifi_stati_sub1", "wifi_stat_gate1", "wifi_usestadns1", "wifi_stat_dnsA1", "wifi_stat_dnsB1", "wifi_stat_dnsC1"},
diff --git a/main/webserver.cpp b/main/webserver.cpp
index e9fe6e2..63896e3 100644
--- a/main/webserver.cpp
+++ b/main/webserver.cpp
@@ -19,8 +19,8 @@ httpd_handle_t httpdHandle;
 
 void initWebserver()
 {
+#ifndef FEATURE_IS_MIR_EGAL_OB_DER_WEBSERVER_KORREKT_ARBEITET
     webserver_lock.construct();
-#ifdef FEATURE_IS_MIR_EGAL_OB_DER_WEBSERVER_FUNKTIONIERT
     webserver_lock->take(portMAX_DELAY);
 #endif
 
@@ -66,7 +66,7 @@ void initWebserver()
 
 void handleWebserver()
 {
-#ifdef FEATURE_IS_MIR_EGAL_OB_DER_WEBSERVER_FUNKTIONIERT
+#ifndef FEATURE_IS_MIR_EGAL_OB_DER_WEBSERVER_KORREKT_ARBEITET
     webserver_lock->give();
     webserver_lock->take(portMAX_DELAY);
 #endif
@@ -129,7 +129,7 @@ bool menuDisplayChanged()
 
 esp_err_t webserver_status_handler(httpd_req_t *req)
 {
-#ifdef FEATURE_IS_MIR_EGAL_OB_DER_WEBSERVER_FUNKTIONIERT
+#ifndef FEATURE_IS_MIR_EGAL_OB_DER_WEBSERVER_KORREKT_ARBEITET
     espcpputils::LockHelper helper{webserver_lock->handle, std::chrono::ceil<espcpputils::ticks>(5s).count()};
     if (!helper.locked())
     {
diff --git a/main/webserver_lock.cpp b/main/webserver_lock.cpp
index ae0dbe1..c2215f9 100644
--- a/main/webserver_lock.cpp
+++ b/main/webserver_lock.cpp
@@ -1,3 +1,5 @@
 #include "webserver_lock.h"
 
+#ifndef FEATURE_IS_MIR_EGAL_OB_DER_WEBSERVER_KORREKT_ARBEITET
 cpputils::DelayedConstruction<espcpputils::mutex_semaphore> webserver_lock;
+#endif
diff --git a/main/webserver_lock.h b/main/webserver_lock.h
index ddb94b5..e6f2429 100644
--- a/main/webserver_lock.h
+++ b/main/webserver_lock.h
@@ -4,4 +4,6 @@
 #include <delayedconstruction.h>
 #include <wrappers/mutex_semaphore.h>
 
+#ifndef FEATURE_IS_MIR_EGAL_OB_DER_WEBSERVER_KORREKT_ARBEITET
 extern cpputils::DelayedConstruction<espcpputils::mutex_semaphore> webserver_lock;
+#endif