diff --git a/haos-addon/src/main.py b/haos-addon/src/main.py
index 2cc6df2..158de5a 100644
--- a/haos-addon/src/main.py
+++ b/haos-addon/src/main.py
@@ -46,7 +46,10 @@ AGG_SENSOR_IDS: Dict[str, List[str]] = {
     "bat_discharge_total": ["bat_discharge_total", "e_bat_discharge_total"],
     "bat_soc":             ["bat_soc", "battery_soc"],
 }
-AGG_AVG = {"bat_soc"}
+AGG_AVG   = {"bat_soc"}
+# Einzelmessungen am Netzanschlusspunkt — nicht über Geräte summieren,
+# sondern den besten Wert nehmen (Goodwe CT-Klemme hat Vorrang vor Proxy)
+AGG_FIRST = {"grid_power"}
 
 AGGREGATE_META: Dict[str, Dict[str, str]] = {
     "total_pv_power":      {"name": "PV Gesamtleistung",            "unit": "W",   "device_class": "power",       "state_class": "measurement",      "icon": "mdi:solar-power"},
@@ -136,10 +139,13 @@ def _compute_aggregates() -> Dict[str, float]:
     result: Dict[str, float] = {}
     for agg_id, vals in buckets.items():
         if vals:
-            result[agg_id] = round(
-                sum(vals) / len(vals) if agg_id in AGG_AVG else sum(vals),
-                3,
-            )
+            if agg_id in AGG_AVG:
+                v = sum(vals) / len(vals)
+            elif agg_id in AGG_FIRST:
+                v = vals[0]   # ersten (besten) Wert nehmen, nicht summieren
+            else:
+                v = sum(vals)
+            result[agg_id] = round(v, 3)
     return result
 
 # ── EMS Hilfsfunktionen ───────────────────────────────────────
@@ -223,6 +229,11 @@ def _poll_loop(inv_cfg: Dict[str, Any], stop: threading.Event):
         t0 = time.time()
         values = reader.read(inverter)
 
+        # Growatt-Proxy: grid_power (positiv=Netzbezug) aus power_to_grid ableiten
+        # wenn kein dedizierter Grid-Meter vorhanden (Goodwe setzt grid_power direkt)
+        if values and "grid_power" not in values and "power_to_grid" in values:
+            values["grid_power"] = -values["power_to_grid"]
+
         # EMS: PV-Überschuss aus anderen Geräten holen und Ladestrom regeln
         if ems is not None and values is not None:
             pv_surplus = _get_pv_surplus()