diff --git a/lib/framework/NetworkSettingsService.cpp b/lib/framework/NetworkSettingsService.cpp
index 587bf3906..2c5e7eb3f 100644
--- a/lib/framework/NetworkSettingsService.cpp
+++ b/lib/framework/NetworkSettingsService.cpp
@@ -19,6 +19,12 @@ NetworkSettingsService::NetworkSettingsService(AsyncWebServer * server, FS * fs,
     WiFi.mode(WIFI_MODE_MAX);
     WiFi.mode(WIFI_MODE_NULL);
 
+#if defined(EMSESP_WIFI_TWEAK)
+    // https: //www.esp32.com/viewtopic.php?t=12055
+    esp_wifi_set_bandwidth(ESP_IF_WIFI_STA, WIFI_BW_HT20);
+    esp_wifi_set_bandwidth(ESP_IF_WIFI_AP, WIFI_BW_HT20);
+#endif
+
     WiFi.onEvent(std::bind(&NetworkSettingsService::WiFiEvent, this, _1));
 
     addUpdateHandler([&](const String & originId) { reconfigureWiFiConnection(); }, false);
diff --git a/lib/framework/NetworkSettingsService.h b/lib/framework/NetworkSettingsService.h
index 64e11f498..6c3df278f 100644
--- a/lib/framework/NetworkSettingsService.h
+++ b/lib/framework/NetworkSettingsService.h
@@ -6,7 +6,12 @@
 #include <HttpEndpoint.h>
 #include <JsonUtils.h>
 
+#ifndef EMSESP_STANDALONE
+#if defined(EMSESP_WIFI_TWEAK)
+#include <esp_wifi.h>
+#endif
 #include <ETH.h>
+#endif
 
 #define NETWORK_SETTINGS_FILE "/config/networkSettings.json"
 #define NETWORK_SETTINGS_SERVICE_PATH "/rest/networkSettings"
@@ -27,10 +32,10 @@
 class NetworkSettings {
   public:
     // core wifi configuration
-    String  ssid;
-    String  password;
-    String  hostname;
-    bool    staticIPConfig;
+    String ssid;
+    String password;
+    String hostname;
+    bool   staticIPConfig;
 
     // optional configuration for static IP address
     IPAddress localIP;
@@ -55,10 +60,10 @@ class NetworkSettings {
     }
 
     static StateUpdateResult update(JsonObject & root, NetworkSettings & settings) {
-        settings.ssid             = root["ssid"] | FACTORY_WIFI_SSID;
-        settings.password         = root["password"] | FACTORY_WIFI_PASSWORD;
-        settings.hostname         = root["hostname"] | FACTORY_WIFI_HOSTNAME;
-        settings.staticIPConfig   = root["static_ip_config"] | false;
+        settings.ssid           = root["ssid"] | FACTORY_WIFI_SSID;
+        settings.password       = root["password"] | FACTORY_WIFI_PASSWORD;
+        settings.hostname       = root["hostname"] | FACTORY_WIFI_HOSTNAME;
+        settings.staticIPConfig = root["static_ip_config"] | false;
 
         // extended settings
         JsonUtils::readIP(root, "local_ip", settings.localIP);