diff --git a/include/WebApi.h b/include/WebApi.h
index 40f5643c..98ed044f 100644
--- a/include/WebApi.h
+++ b/include/WebApi.h
@@ -33,8 +33,6 @@ private:
     WebApiWsLiveClass _webApiWsLive;
 
     void onWebsocketEvent(AsyncWebSocket* server, AsyncWebSocketClient* client, AwsEventType type, void* arg, uint8_t* data, size_t len);
-
-    void onNotFound(AsyncWebServerRequest* request);
 };
 
 extern WebApiClass WebApi;
\ No newline at end of file
diff --git a/src/WebApi.cpp b/src/WebApi.cpp
index b9d4d192..71bcf451 100644
--- a/src/WebApi.cpp
+++ b/src/WebApi.cpp
@@ -30,7 +30,6 @@ void WebApiClass::init()
 
     _webApiWsLive.init(&_ws);
 
-    _server.onNotFound(std::bind(&WebApiClass::onNotFound, this, _1));
     _server.begin();
 }
 
@@ -51,11 +50,7 @@ void WebApiClass::loop()
     _ws.cleanupClients();
 }
 
-void WebApiClass::onNotFound(AsyncWebServerRequest* request)
-{
-    // Handle Unknown Request
-    request->send(404, "text/plain", "404 Not Found");
-}
+
 
 void WebApiClass::onWebsocketEvent(AsyncWebSocket* server, AsyncWebSocketClient* client, AwsEventType type, void* arg, uint8_t* data, size_t len)
 {
diff --git a/src/WebApi_webapp.cpp b/src/WebApi_webapp.cpp
index 704cdd82..0f03a5f3 100644
--- a/src/WebApi_webapp.cpp
+++ b/src/WebApi_webapp.cpp
@@ -22,6 +22,12 @@ void WebApiWebappClass::init(AsyncWebServer* server)
         request->send(response);
     });
 
+    _server->onNotFound([](AsyncWebServerRequest* request) {
+        AsyncWebServerResponse* response = request->beginResponse_P(200, "text/html", file_index_html_start, file_index_html_end - file_index_html_start);
+        response->addHeader("Content-Encoding", "gzip");
+        request->send(response);
+    });
+
     _server->on("/index.html", HTTP_GET, [](AsyncWebServerRequest* request) {
         AsyncWebServerResponse* response = request->beginResponse_P(200, "text/html", file_index_html_start, file_index_html_end - file_index_html_start);
         response->addHeader("Content-Encoding", "gzip");