diff --git a/esp32/include/communication/comm_base.hpp b/esp32/include/communication/comm_base.hpp
index 1a55429..cafd346 100644
--- a/esp32/include/communication/comm_base.hpp
+++ b/esp32/include/communication/comm_base.hpp
@@ -47,7 +47,7 @@ class CommAdapterBase {
 #else
         String out;
         serializeJson(doc, out);
-        send(out.c_str(), cid);
+        send(out.c_str(), -1);
 #endif
     }
 
diff --git a/esp32/include/system_service.h b/esp32/include/system_service.h
index 00de032..0213613 100644
--- a/esp32/include/system_service.h
+++ b/esp32/include/system_service.h
@@ -1,6 +1,9 @@
 #pragma once
 
+#include <ESPmDNS.h>
 #include <esp_http_server.h>
+#include <WiFi.h>
+#include <communication/websocket_adapter.h>
 #include <filesystem.h>
 #include <global.h>
 #include <esp_timer.h>
@@ -23,7 +26,7 @@ void sleep();
 void status(JsonObject &root);
 void metrics(JsonObject &root);
 
-void emitMetrics();
+void emitMetrics(Websocket &socket);
 
 const char *resetReason(esp_reset_reason_t reason);
 } // namespace system_service
\ No newline at end of file
diff --git a/esp32/src/main.cpp b/esp32/src/main.cpp
index 1b2d668..a536cca 100644
--- a/esp32/src/main.cpp
+++ b/esp32/src/main.cpp
@@ -209,7 +209,7 @@ void IRAM_ATTR serviceLoopEntry(void *) {
     for (;;) {
         wifiService.loop();
         apService.loop();
-        EXECUTE_EVERY_N_MS(2000, system_service::emitMetrics());
+        EXECUTE_EVERY_N_MS(2000, system_service::emitMetrics(socket));
 
         vTaskDelay(100 / portTICK_PERIOD_MS);
     }
diff --git a/esp32/src/system_service.cpp b/esp32/src/system_service.cpp
index 4bd4f30..00dd091 100644
--- a/esp32/src/system_service.cpp
+++ b/esp32/src/system_service.cpp
@@ -113,13 +113,14 @@ void metrics(JsonObject &root) {
     root["core_temp"] = temperatureRead();
 }
 
-void emitMetrics() {
-    // if (!socket.hasSubscribers(EVENT_ANALYTICS)) return;
-    // analyticsDoc.clear();
-    // JsonObject root = analyticsDoc.to<JsonObject>();
-    // system_service::metrics(root);
-    // JsonVariant data = analyticsDoc.as<JsonVariant>();
-    // socket.emit(EVENT_ANALYTICS, data);
+void emitMetrics(Websocket &socket) {
+    if (!socket.hasSubscribers(EVENT_ANALYTICS)) return;
+
+    JsonDocument doc;
+    JsonObject root = doc.to<JsonObject>();
+    system_service::metrics(root);
+    JsonVariant data = doc.as<JsonVariant>();
+    socket.emit(EVENT_ANALYTICS, data);
 }
 
 const char *resetReason(esp_reset_reason_t reason) {