diff --git a/dashboards/system/power-consumption.json b/dashboards/system/power-consumption.json
index b340b1a..467eb32 100644
--- a/dashboards/system/power-consumption.json
+++ b/dashboards/system/power-consumption.json
@@ -80,11 +80,17 @@
             "type": "prometheus",
             "uid": "${DS_PROMETHEUS}"
           },
-          "expr": "power",
+          "disableTextWrap": false,
+          "editorMode": "code",
+          "expr": "sum(power{namespace=\"shelly-plug\"})",
+          "fullMetaSearch": false,
+          "includeNullMetadata": true,
           "interval": "",
           "legendFormat": "Watts",
           "queryType": "randomWalk",
-          "refId": "A"
+          "range": true,
+          "refId": "A",
+          "useBackend": false
         }
       ],
       "title": "Power Consumption (Latest)",
@@ -151,11 +157,17 @@
             "type": "prometheus",
             "uid": "${DS_PROMETHEUS}"
           },
-          "expr": "power",
+          "disableTextWrap": false,
+          "editorMode": "builder",
+          "expr": "sum(power{namespace=\"shelly-plug\"})",
+          "fullMetaSearch": false,
+          "includeNullMetadata": true,
           "interval": "",
           "legendFormat": "Watts",
           "queryType": "randomWalk",
-          "refId": "A"
+          "range": true,
+          "refId": "A",
+          "useBackend": false
         }
       ],
       "title": "Power Consumption (Average)",
@@ -251,11 +263,17 @@
             "type": "prometheus",
             "uid": "${DS_PROMETHEUS}"
           },
-          "expr": "power",
+          "disableTextWrap": false,
+          "editorMode": "builder",
+          "expr": "sum(power{namespace=\"shelly-plug\"})",
+          "fullMetaSearch": false,
+          "includeNullMetadata": true,
           "interval": "",
           "legendFormat": "Watts",
           "queryType": "randomWalk",
-          "refId": "A"
+          "range": true,
+          "refId": "A",
+          "useBackend": false
         }
       ],
       "title": "Power Consumption",
@@ -288,5 +306,5 @@
   "timezone": "browser",
   "title": "Server Power Consumption",
   "uid": "023265aca2f075d392c0ce5d",
-  "version": 11
+  "version": 12
 }