diff --git a/main.py b/main.py
index f9dcbba..c4827ce 100644
--- a/main.py
+++ b/main.py
@@ -294,7 +294,8 @@ async def update_latest_data():
 
 @app.get("/monitor")
 async def get_monitor_data():
-    return JSONResponse(content=latest_data)
+    return latest_data
+    # return JSONResponse(content=latest_data)
 
 
 # LOCAL RECORDER
diff --git a/templates/control.html b/templates/control.html
index a0440a4..2b322e7 100644
--- a/templates/control.html
+++ b/templates/control.html
@@ -523,14 +523,6 @@
                 const dataResponse = await fetch('/monitor');
                 const allData = await dataResponse.json();
 
-                // Update Tank Level and Qconso
-                const dsData = allData["DS"];
-                if (dsData) {
-                    document.querySelector("#TankLevel .monitor-value").innerHTML = `DS<br>${dsData.TankLevel.toFixed(1)}`;
-                    const qconso = dsData.Qinlet - dsData.Qoutlet;
-                    document.querySelector("#Qconso .monitor-value").innerHTML = `DS<br>${qconso.toFixed(1)} L/h`;
-                }
-
                 for (const [fieldId, unit] of Object.entries(fields)) {
                     const container = document.getElementById(fieldId);
                     if (!container) continue;
@@ -543,6 +535,15 @@
                         }
                     });
                 }
+
+                // Update Tank Level and Qconso
+                const dsData = allData["DS"];
+                if (dsData) {
+                    document.querySelector("#TankLevel .monitor-value").innerHTML = `DS<br>${dsData.TankLevel.toFixed(1)}`;
+                    const qconso = dsData.Qinlet - dsData.Qoutlet;
+                    document.querySelector("#Qconso .monitor-value").innerHTML = `DS<br>${qconso.toFixed(1)} L/h`;
+                }
+                
             } catch (error) {
                 console.error('Error fetching monitor data:', error);
             }