diff --git a/components/connect/connect.c b/components/connect/connect.c
index 36be658ad..bca16ed54 100644
--- a/components/connect/connect.c
+++ b/components/connect/connect.c
@@ -223,6 +223,9 @@ void wifi_init(const char * wifi_ssid, const char * wifi_pass, const char * host
     /* Start WiFi */
     ESP_ERROR_CHECK(esp_wifi_start());
 
+    /* Disable power savings for best performance */
+    ESP_ERROR_CHECK(esp_wifi_set_ps(WIFI_PS_NONE));
+
     /* Set Hostname */
     esp_err_t err = esp_netif_set_hostname(esp_netif_sta, hostname);
     if (err != ERR_OK) {
diff --git a/main/http_server/http_server.c b/main/http_server/http_server.c
index e626fb742..d9ff4bb0c 100644
--- a/main/http_server/http_server.c
+++ b/main/http_server/http_server.c
@@ -691,6 +691,7 @@ esp_err_t start_rest_server(void * pvParameters)
 
     httpd_config_t config = HTTPD_DEFAULT_CONFIG();
     config.uri_match_fn = httpd_uri_match_wildcard;
+    config.max_open_sockets = 10;
     config.max_uri_handlers = 20;
 
     ESP_LOGI(TAG, "Starting HTTP Server");
diff --git a/sdkconfig.defaults b/sdkconfig.defaults
index 63d09ca1c..23cd0473d 100644
--- a/sdkconfig.defaults
+++ b/sdkconfig.defaults
@@ -10,3 +10,5 @@ CONFIG_SPIFFS_OBJ_NAME_LEN=64
 CONFIG_HTTPD_MAX_URI_LEN=2048
 CONFIG_ESP32S3_DEFAULT_CPU_FREQ_240=y
 CONFIG_ESP_WIFI_11KV_SUPPORT=y
+CONFIG_BT_ENABLED=n
+CONFIG_LWIP_MAX_SOCKETS=16
\ No newline at end of file