diff --git a/CHANGELOG_LATEST.md b/CHANGELOG_LATEST.md
index 9168f2211..5cf6be35d 100644
--- a/CHANGELOG_LATEST.md
+++ b/CHANGELOG_LATEST.md
@@ -12,5 +12,6 @@ For more details go to [emsesp.org](https://emsesp.org/).
 
 - signed value for solarInfuence [#3077](https://github.com/emsesp/EMS-ESP32/issues/3077)
 - set bin file upload limit to 1M again [3086](https://github.com/emsesp/EMS-ESP32/issues/3086)
+- Fix: Prevent system crash during WiFi network discovery on ESP32-S3 hardware [#3128](https://github.com/emsesp/EMS-ESP32/pull/3128)
 
 ## Changed
diff --git a/src/ESP32React/WiFiScanner.cpp b/src/ESP32React/WiFiScanner.cpp
index 6b222e107..425992f98 100644
--- a/src/ESP32React/WiFiScanner.cpp
+++ b/src/ESP32React/WiFiScanner.cpp
@@ -15,7 +15,7 @@ void WiFiScanner::scanNetworks(AsyncWebServerRequest * request) {
 
     if (WiFi.scanComplete() != -1) {
         WiFi.scanDelete();
-        WiFi.scanNetworks(true);
+        WiFi.scanNetworks(true, false, true, 250);
     }
 }
 
@@ -38,6 +38,10 @@ void WiFiScanner::listNetworks(AsyncWebServerRequest * request) {
     } else if (numNetworks == -1) {
         request->send(202); // special code to indicate scan in progress
     } else {
-        scanNetworks(request);
+        auto * response = new AsyncJsonResponse(false);
+        JsonObject root = response->getRoot();
+        root["networks"].to<JsonArray>();
+        response->setLength();
+        request->send(response);
     }
 }
diff --git a/src/emsesp_version.h b/src/emsesp_version.h
index 417585ea4..340c555c0 100644
--- a/src/emsesp_version.h
+++ b/src/emsesp_version.h
@@ -1 +1 @@
-#define EMSESP_APP_VERSION "3.8.3-dev.5"
+#define EMSESP_APP_VERSION "3.8.3-dev.6"