diff --git a/data-src/index.html b/data-src/index.html
index 20ef11d..616a1c2 100644
--- a/data-src/index.html
+++ b/data-src/index.html
@@ -246,6 +246,8 @@
                                 <span id="spanMaxMemory" style="text-align:right;width:120px;"></span>
                                 <span style="text-align:right;display:inline-block;color:#00bcd4;">Min: </span>
                                 <span id="spanMinMemory" style="text-align:right;width:120px;"></span>
+                                <span style="text-align:right;display:inline-block;color:#00bcd4;">Uptime: </span>
+                                <span id="spanUptime" style="text-align:right;width:120px;"></span>
                             </div>
                         </div>
                         <div class="button-container">
diff --git a/data-src/index.js b/data-src/index.js
index 89f1aea..7a689c6 100644
--- a/data-src/index.js
+++ b/data-src/index.js
@@ -4385,6 +4385,8 @@ class Firmware {
         if (sp) sp.innerHTML = mem.max.fmt('#,##0');
         sp = document.getElementById('spanMinMemory');
         if (sp) sp.innerHTML = mem.min.fmt('#,##0');
+        sp = document.getElementById('spanUptime');
+        if (sp) sp.innerHTML = mem.uptime / 3600000;
 
 
     }
diff --git a/src/Network.cpp b/src/Network.cpp
index ad8f2e1..914d4fd 100644
--- a/src/Network.cpp
+++ b/src/Network.cpp
@@ -691,6 +691,7 @@ void Network::emitHeap(uint8_t num) {
     json->addElem("free", freeHeap);
     json->addElem("min", minHeap);
     json->addElem("total", ESP.getHeapSize());
+    json->addElem("uptime", (uint64_t)millis());
     json->endObject();
     if(num == 255 && bTimeEmit && bValEmit) {
       sockEmit.endEmit(num);
diff --git a/src/Web.cpp b/src/Web.cpp
index 13b8737..b5c148e 100644
--- a/src/Web.cpp
+++ b/src/Web.cpp
@@ -249,7 +249,7 @@ void Web::handleController(WebServer &server) {
     resp.addElem("maxGroupedShades", (uint8_t)SOMFY_MAX_GROUPED_SHADES);
     resp.addElem("maxLinkedRemotes", (uint8_t)SOMFY_MAX_LINKED_REMOTES);
     resp.addElem("startingAddress", (uint32_t)somfy.startingAddress);
-    resp.addElem("uptime", (uint64_t)millis());
+
     resp.beginObject("transceiver");
     somfy.transceiver.toJSON(resp);
     resp.endObject();
@@ -816,6 +816,7 @@ void Web::handleDiscovery(WebServer &server) {
     resp.addElem("free", ESP.getFreeHeap());
     resp.addElem("min", ESP.getMinFreeHeap());
     resp.addElem("total", ESP.getHeapSize());
+    resp.addElem("uptime", (uint64_t)millis());
     resp.endObject();
     resp.beginArray("rooms");
     somfy.toJSONRooms(resp);