diff --git a/platformio.ini b/platformio.ini
index a4d1046..e9a63e3 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -20,7 +20,7 @@ build_flags =
     -DCOMPONENT_EMBED_FILES=webapp_dist/index.html.gz:webapp_dist/zones.json.gz:webapp_dist/favicon.ico:webapp_dist/js/app.js.gz
 
 lib_deps =
-    https://github.com/me-no-dev/ESPAsyncWebServer.git
+    https://github.com/yubox-node-org/ESPAsyncWebServer
     bblanchon/ArduinoJson @ ^6.19.4
     https://github.com/bertmelis/espMqttClient.git
     nrf24/RF24 @ ^1.4.5
diff --git a/src/WebApi_ws_live.cpp b/src/WebApi_ws_live.cpp
index ae788c4..e8848ae 100644
--- a/src/WebApi_ws_live.cpp
+++ b/src/WebApi_ws_live.cpp
@@ -61,10 +61,9 @@ void WebApiWsLiveClass::loop()
         JsonVariant var = root;
         generateJsonResponse(var);
 
-        size_t len = measureJson(root);
-        AsyncWebSocketMessageBuffer* buffer = _ws.makeBuffer(len); //  creates a buffer (len + 1) for you.
+        String buffer;
         if (buffer) {
-            serializeJson(root, reinterpret_cast<char*>(buffer->get()), len + 1);
+            serializeJson(root, buffer);
             _ws.textAll(buffer);
         }