diff --git a/haos-addon/src/main.py b/haos-addon/src/main.py
index 3319049..2cc6df2 100644
--- a/haos-addon/src/main.py
+++ b/haos-addon/src/main.py
@@ -37,7 +37,7 @@ AGG_SENSOR_IDS: Dict[str, List[str]] = {
     "total_ac_power":      ["ac_power", "ac_power_total"],
     "total_energy_today":  ["energy_today", "e_day"],
     "total_energy_total":  ["energy_total", "e_total"],
-    "grid_power":          ["total_power", "active_power"],
+    "grid_power":          ["grid_power"],
     "grid_import_kwh":     ["import_kwh", "e_total_imp"],
     "grid_export_kwh":     ["export_kwh", "e_total_exp"],
     "bat_charge_power":    ["bat_charge_power"],
@@ -131,6 +131,7 @@ def _compute_aggregates() -> Dict[str, float]:
                 for sid in sensor_ids:
                     if sid in values:
                         buckets[agg_id].append(values[sid])
+                        break
 
     result: Dict[str, float] = {}
     for agg_id, vals in buckets.items():