diff --git a/kubernetes/apps/monitoring/dashboards/heatpump-dhw-loading.json b/kubernetes/apps/monitoring/dashboards/heatpump-dhw-loading.json
index a2409a3f..7ba1d33d 100644
--- a/kubernetes/apps/monitoring/dashboards/heatpump-dhw-loading.json
+++ b/kubernetes/apps/monitoring/dashboards/heatpump-dhw-loading.json
@@ -29,14 +29,14 @@
         {
           "refId": "A",
           "datasource": { "type": "prometheus", "uid": "prometheus" },
-          "expr": "homeassistant_sensor_power_w{entity=\"sensor.vitocal_dhw_loading_power\"}",
+          "expr": "max by (entity) (homeassistant_sensor_power_w{entity=\"sensor.vitocal_dhw_loading_power\"})",
           "legendFormat": "Ladeleistung",
           "format": "time_series"
         },
         {
           "refId": "B",
           "datasource": { "type": "prometheus", "uid": "prometheus" },
-          "expr": "homeassistant_sensor_temperature_celsius{entity=\"sensor.vitocal_250_a_vitocal_outside_temperature\"}",
+          "expr": "max by (entity) (homeassistant_sensor_temperature_celsius{entity=\"sensor.vitocal_250_a_vitocal_outside_temperature\"})",
           "legendFormat": "Aussentemp",
           "format": "time_series"
         }
@@ -68,7 +68,7 @@
         {
           "refId": "A",
           "datasource": { "type": "prometheus", "uid": "prometheus" },
-          "expr": "homeassistant_sensor_power_w{entity=\"sensor.vitocal_dhw_loading_power\"}",
+          "expr": "max by (entity) (homeassistant_sensor_power_w{entity=\"sensor.vitocal_dhw_loading_power\"})",
           "legendFormat": "Ladeleistung"
         }
       ]
@@ -94,7 +94,7 @@
         {
           "refId": "A",
           "datasource": { "type": "prometheus", "uid": "prometheus" },
-          "expr": "homeassistant_sensor_power_w{entity=\"sensor.vitocal_dhw_loading_power\"}",
+          "expr": "max by (entity) (homeassistant_sensor_power_w{entity=\"sensor.vitocal_dhw_loading_power\"})",
           "legendFormat": "Ladeleistung"
         }
       ]
@@ -120,7 +120,7 @@
         {
           "refId": "A",
           "datasource": { "type": "prometheus", "uid": "prometheus" },
-          "expr": "homeassistant_sensor_temperature_celsius{entity=\"sensor.vitocal_250_a_vitocal_outside_temperature\"}",
+          "expr": "max by (entity) (homeassistant_sensor_temperature_celsius{entity=\"sensor.vitocal_250_a_vitocal_outside_temperature\"})",
           "legendFormat": "Außentemp"
         }
       ]