diff --git a/include/WebApi.h b/include/WebApi.h
index cf5aa1a7..be0b2416 100644
--- a/include/WebApi.h
+++ b/include/WebApi.h
@@ -6,6 +6,7 @@ class WebApiClass {
 public:
     WebApiClass();
     void init();
+    void loop();
 
 private:
     AsyncWebServer _server;
diff --git a/src/WebApi.cpp b/src/WebApi.cpp
index 94fcff18..84dc6793 100644
--- a/src/WebApi.cpp
+++ b/src/WebApi.cpp
@@ -97,6 +97,12 @@ void WebApiClass::init()
     _server.begin();
 }
 
+void WebApiClass::loop()
+{
+    // see: https://github.com/me-no-dev/ESPAsyncWebServer#limiting-the-number-of-web-socket-clients
+    _ws.cleanupClients();
+}
+
 void WebApiClass::onNotFound(AsyncWebServerRequest* request)
 {
     // Handle Unknown Request
diff --git a/src/main.cpp b/src/main.cpp
index cfdbfb01..8cba74eb 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -96,4 +96,6 @@ void loop()
     yield();
     MqttPublishing.loop();
     yield();
+    WebApi.loop();
+    yield();
 }
\ No newline at end of file