diff --git a/config_allfeatures.cmake b/config_allfeatures.cmake
index 7b5ba5e..ab62a65 100644
--- a/config_allfeatures.cmake
+++ b/config_allfeatures.cmake
@@ -37,7 +37,6 @@ set(BOBBYCAR_BUILDFLAGS
     -DFEATURE_CAN
 #    -DFEATURE_SERIAL
 #    -DFEATURE_MOSFETS
-    -DFEATURE_WEBSERVER
 #    -DFEATURE_BLUETOOTH
 #    -DFEATURE_BMS
 #    -DFEATURE_GAMETRAK
diff --git a/config_comred.cmake b/config_comred.cmake
index 8a6867f..f057f6c 100644
--- a/config_comred.cmake
+++ b/config_comred.cmake
@@ -37,7 +37,6 @@ set(BOBBYCAR_BUILDFLAGS
     -DFEATURE_CAN
 #    -DFEATURE_SERIAL
 #    -DFEATURE_MOSFETS
-    -DFEATURE_WEBSERVER
 #    -DFEATURE_BLUETOOTH
 #    -DFEATURE_BMS
 #    -DFEATURE_GAMETRAK
diff --git a/config_feedc0de.cmake b/config_feedc0de.cmake
index 99fe846..9137b53 100644
--- a/config_feedc0de.cmake
+++ b/config_feedc0de.cmake
@@ -37,7 +37,6 @@ set(BOBBYCAR_BUILDFLAGS
     -DFEATURE_CAN
 #    -DFEATURE_SERIAL
     -DFEATURE_MOSFETS
-    -DFEATURE_WEBSERVER
 #    -DFEATURE_BLUETOOTH
 #    -DFEATURE_BMS
 #    -DFEATURE_GAMETRAK
diff --git a/config_mick.cmake b/config_mick.cmake
index 338a9f5..d3bf530 100644
--- a/config_mick.cmake
+++ b/config_mick.cmake
@@ -37,7 +37,6 @@ set(BOBBYCAR_BUILDFLAGS
     -DFEATURE_CAN
 #    -DFEATURE_SERIAL
 #    -DFEATURE_MOSFETS
-    -DFEATURE_WEBSERVER
 #    -DFEATURE_BLUETOOTH
 #    -DFEATURE_BMS
 #    -DFEATURE_GAMETRAK
diff --git a/config_nofeatures.cmake b/config_nofeatures.cmake
index c6027fc..b7e70cc 100644
--- a/config_nofeatures.cmake
+++ b/config_nofeatures.cmake
@@ -37,7 +37,6 @@ set(BOBBYCAR_BUILDFLAGS
 #    -DFEATURE_CAN
 #    -DFEATURE_SERIAL
 #    -DFEATURE_MOSFETS
-#    -DFEATURE_WEBSERVER
 #    -DFEATURE_BLUETOOTH
 #    -DFEATURE_BMS
 #    -DFEATURE_GAMETRAK
diff --git a/config_peter.cmake b/config_peter.cmake
index c8ae9af..48cc866 100644
--- a/config_peter.cmake
+++ b/config_peter.cmake
@@ -37,7 +37,6 @@ set(BOBBYCAR_BUILDFLAGS
     -DFEATURE_CAN
 #    -DFEATURE_SERIAL
 #    -DFEATURE_MOSFETS
-    -DFEATURE_WEBSERVER
 #    -DFEATURE_BLUETOOTH
 #    -DFEATURE_BMS
 #    -DFEATURE_GAMETRAK
diff --git a/main/newsettings.h b/main/newsettings.h
index 4694167..0d2ef3f 100644
--- a/main/newsettings.h
+++ b/main/newsettings.h
@@ -330,7 +330,8 @@ public:
         ConfigWrapper<bool> ntp                   {false,                                  DoReset,   {},                         "f_ntp"               };
         ConfigWrapper<bool> ble                   {false,                                  DoReset,   {},                         "f_ble"               };
         ConfigWrapper<bool> ota                   {false,                                  DoReset,   {},                         "f_ota"               };
-        ConfigWrapper<bool> gschissene_diode      {false,                                  DoReset,   {},                         "f_gschissDiode"      };
+        ConfigWrapper<bool> webserver             {true,                                   DoReset,   {},                         "featureWebserv"      };
+        ConfigWrapper<bool> gschissene_diode      {false,                                  DoReset,   {},                         "featurDiodeHin"      };
     } feature;
 
     struct {
@@ -631,6 +632,7 @@ public:
     x(feature.ntp) \
     x(feature.ble) \
     x(feature.ota) \
+    x(feature.webserver) \
     x(feature.gschissene_diode)
     //x(bleSettings.bleEnabled)
 
@@ -643,7 +645,8 @@ public:
     x(feature.dnsannounce) \
     x(feature.ntp) \
     x(feature.ble) \
-    x(feature.ota)
+    x(feature.ota) \
+    x(feature.webserver)
     //x(feature.gschisseneDiode)
 
     template<typename T>
diff --git a/main/taskmanager.cpp b/main/taskmanager.cpp
index abb4789..40eca4c 100644
--- a/main/taskmanager.cpp
+++ b/main/taskmanager.cpp
@@ -47,9 +47,7 @@
 #endif
 #include "ota.h"
 #include "ble_bobby.h"
-#ifdef FEATURE_WEBSERVER
 #include "webserver.h"
-#endif
 #include "ledstrip.h"
 #ifdef FEATURE_ESPNOW
 #include "espnowfunctions.h"
@@ -108,9 +106,7 @@ BobbySchedulerTask schedulerTasksArr[] {
 #endif
     BobbySchedulerTask { "ota",            initOta,               handleOta,               50ms  },
     BobbySchedulerTask { "ble",            initBle,               handleBle,               100ms },
-#ifdef FEATURE_WEBSERVER
     BobbySchedulerTask { "webserver",      initWebserver,         handleWebserver,         100ms },
-#endif
     BobbySchedulerTask { "ledstrip",       initLedStrip,          updateLedStrip,          30ms },
 #ifdef FEATURE_ESPNOW
     BobbySchedulerTask { "espnow",         espnow::initESPNow,    espnow::handle,          100ms },
diff --git a/main/webserver.cpp b/main/webserver.cpp
index 945d493..5b27d17 100644
--- a/main/webserver.cpp
+++ b/main/webserver.cpp
@@ -29,7 +29,6 @@
 
 using namespace std::chrono_literals;
 
-#ifdef FEATURE_WEBSERVER
 namespace {
 constexpr const char * const TAG = "BOBBYWEB";
 
@@ -204,4 +203,3 @@ esp_err_t webserver_status_handler(httpd_req_t *req)
 }
 
 } // namespace
-#endif
diff --git a/main/webserver.h b/main/webserver.h
index 6312b93..ae61cd2 100644
--- a/main/webserver.h
+++ b/main/webserver.h
@@ -1,14 +1,10 @@
 #pragma once
 
 // esp-idf includes
-#ifdef FEATURE_WEBSERVER
 #include <esp_http_server.h>
-#endif
 
-#ifdef FEATURE_WEBSERVER
 extern httpd_handle_t httpdHandle;
 
 void initWebserver();
 void handleWebserver();
 bool MenuDisplayChanged();
-#endif
diff --git a/main/webserver_displaycontrol.cpp b/main/webserver_displaycontrol.cpp
index b1c7e5c..02be330 100644
--- a/main/webserver_displaycontrol.cpp
+++ b/main/webserver_displaycontrol.cpp
@@ -1,9 +1,7 @@
 #include "webserver_displaycontrol.h"
 
 // esp-idf includes
-#ifdef FEATURE_WEBSERVER
 #include <esp_http_server.h>
-#endif
 #include <esp_log.h>
 
 // 3rdparty lib includes
@@ -26,7 +24,6 @@
 #include "webserver_lock.h"
 #include "newsettings.h"
 
-#ifdef FEATURE_WEBSERVER
 using esphttpdutils::HtmlTag;
 using namespace std::chrono_literals;
 
@@ -613,4 +610,3 @@ esp_err_t webserver_setValue_handler(httpd_req_t *req)
     CALL_AND_EXIT_ON_ERROR(httpd_resp_set_hdr, req, "Location", "/")
     CALL_AND_EXIT(esphttpdutils::webserver_resp_send, req, esphttpdutils::ResponseStatus::TemporaryRedirect, "text/html", "Ok, continue at <a href=\"/\">/</a>")
 }
-#endif
diff --git a/main/webserver_displaycontrol.h b/main/webserver_displaycontrol.h
index 90a6fbf..3ba9dfb 100644
--- a/main/webserver_displaycontrol.h
+++ b/main/webserver_displaycontrol.h
@@ -1,15 +1,11 @@
 #pragma once
 
 // esp-idf includes
-#ifdef FEATURE_WEBSERVER
 #include <esp_http_server.h>
-#endif
 #include <esp_err.h>
 
-#ifdef FEATURE_WEBSERVER
 esp_err_t webserver_root_handler(httpd_req_t *req);
 esp_err_t webserver_triggerRawButton_handler(httpd_req_t *req);
 esp_err_t webserver_triggerButton_handler(httpd_req_t *req);
 esp_err_t webserver_triggerItem_handler(httpd_req_t *req);
 esp_err_t webserver_setValue_handler(httpd_req_t *req);
-#endif
diff --git a/main/webserver_dumpnvs.cpp b/main/webserver_dumpnvs.cpp
index f1671f0..80def2f 100644
--- a/main/webserver_dumpnvs.cpp
+++ b/main/webserver_dumpnvs.cpp
@@ -1,9 +1,7 @@
 #include "webserver_dumpnvs.h"
 
 // esp-idf includes
-#ifdef FEATURE_WEBSERVER
 #include <esp_http_server.h>
-#endif
 #include <esp_log.h>
 
 // 3rdparty lib includes
diff --git a/main/webserver_dumpnvs.h b/main/webserver_dumpnvs.h
index 9653e26..8ab5084 100644
--- a/main/webserver_dumpnvs.h
+++ b/main/webserver_dumpnvs.h
@@ -1,12 +1,8 @@
 #pragma once
 
 // esp-idf includes
-#ifdef FEATURE_WEBSERVER
 #include <esp_http_server.h>
-#endif
 #include <esp_err.h>
 
-#ifdef FEATURE_WEBSERVER
 esp_err_t webserver_dump_nvs_handler(httpd_req_t *req);
-#endif
 
diff --git a/main/webserver_newsettings.cpp b/main/webserver_newsettings.cpp
index a79d942..7f0d3d6 100644
--- a/main/webserver_newsettings.cpp
+++ b/main/webserver_newsettings.cpp
@@ -4,9 +4,7 @@
 #include <limits>
 
 // esp-idf includes
-#ifdef FEATURE_WEBSERVER
 #include <esp_http_server.h>
-#endif
 #include <esp_log.h>
 
 // 3rdparty lib includes
@@ -24,7 +22,6 @@
 #include "newsettings.h"
 #include "webserver_lock.h"
 
-#ifdef FEATURE_WEBSERVER
 using namespace std::chrono_literals;
 using esphttpdutils::HtmlTag;
 
@@ -645,4 +642,3 @@ esp_err_t webserver_resetNewSettings_handler(httpd_req_t *req)
                   "text/plain",
                   body)
 }
-#endif
diff --git a/main/webserver_newsettings.h b/main/webserver_newsettings.h
index cbdaa55..d95eb54 100644
--- a/main/webserver_newsettings.h
+++ b/main/webserver_newsettings.h
@@ -1,13 +1,9 @@
 #pragma once
 
 // esp-idf includes
-#ifdef FEATURE_WEBSERVER
 #include <esp_http_server.h>
-#endif
 #include <esp_err.h>
 
-#ifdef FEATURE_WEBSERVER
 esp_err_t webserver_newSettings_handler(httpd_req_t *req);
 esp_err_t webserver_saveNewSettings_handler(httpd_req_t *req);
 esp_err_t webserver_resetNewSettings_handler(httpd_req_t *req);
-#endif
diff --git a/main/webserver_ota.cpp b/main/webserver_ota.cpp
index 86ebe34..eadd2e3 100644
--- a/main/webserver_ota.cpp
+++ b/main/webserver_ota.cpp
@@ -1,9 +1,7 @@
 #include "webserver_ota.h"
 
 // esp-idf includes
-#ifdef FEATURE_WEBSERVER
 #include <esp_http_server.h>
-#endif
 #include <esp_log.h>
 #include <esp_ota_ops.h>
 
@@ -22,7 +20,6 @@
 #include "globals.h"
 #include "newsettings.h"
 
-#ifdef FEATURE_WEBSERVER
 using namespace std::chrono_literals;
 using esphttpdutils::HtmlTag;
 
@@ -423,4 +420,3 @@ esp_err_t webserver_trigger_ota_handler(httpd_req_t *req)
     CALL_AND_EXIT_ON_ERROR(httpd_resp_set_hdr, req, "Location", "/ota")
     CALL_AND_EXIT(esphttpdutils::webserver_resp_send, req, esphttpdutils::ResponseStatus::TemporaryRedirect, "text/html", "Ok, continue at <a href=\"/ota\">/</a>")
 }
-#endif
diff --git a/main/webserver_ota.h b/main/webserver_ota.h
index e1619a4..b6711e4 100644
--- a/main/webserver_ota.h
+++ b/main/webserver_ota.h
@@ -1,13 +1,9 @@
 #pragma once
 
 // esp-idf includes
-#ifdef FEATURE_WEBSERVER
 #include <esp_http_server.h>
-#endif
 #include <esp_err.h>
 
-#ifdef FEATURE_WEBSERVER
 esp_err_t webserver_ota_handler(httpd_req_t *req);
 esp_err_t webserver_ota_percentage_handler(httpd_req_t *req);
 esp_err_t webserver_trigger_ota_handler(httpd_req_t *req);
-#endif
diff --git a/main/webserver_settings.cpp b/main/webserver_settings.cpp
index 180e9aa..eea9daf 100644
--- a/main/webserver_settings.cpp
+++ b/main/webserver_settings.cpp
@@ -4,9 +4,7 @@
 #include <limits>
 
 // esp-idf includes
-#ifdef FEATURE_WEBSERVER
 #include <esp_http_server.h>
-#endif
 #include <esp_log.h>
 
 // 3rdparty lib includes
@@ -22,7 +20,6 @@
 #include "globals.h"
 #include "webserver_lock.h"
 
-#ifdef FEATURE_WEBSERVER
 using namespace std::chrono_literals;
 using esphttpdutils::HtmlTag;
 
@@ -325,4 +322,3 @@ esp_err_t webserver_saveSettings_handler(httpd_req_t *req)
                   "text/plain",
                   body)
 }
-#endif
diff --git a/main/webserver_settings.h b/main/webserver_settings.h
index db6c309..b55cb3f 100644
--- a/main/webserver_settings.h
+++ b/main/webserver_settings.h
@@ -1,12 +1,8 @@
 #pragma once
 
 // esp-idf includes
-#ifdef FEATURE_WEBSERVER
 #include <esp_http_server.h>
-#endif
 #include <esp_err.h>
 
-#ifdef FEATURE_WEBSERVER
 esp_err_t webserver_settings_handler(httpd_req_t *req);
 esp_err_t webserver_saveSettings_handler(httpd_req_t *req);
-#endif