From cfa8eb5370036f86af7efc9955797da8bd52d00a Mon Sep 17 00:00:00 2001
From: Petar Petrov <MindFreeze@users.noreply.github.com>
Date: Mon, 9 Mar 2026 11:51:28 +0100
Subject: [PATCH] Fix hasReturn check to scan all grid sources in energy view
 strategy (#30062)

---
 src/panels/energy/strategies/energy-view-strategy.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/panels/energy/strategies/energy-view-strategy.ts b/src/panels/energy/strategies/energy-view-strategy.ts
index 1cdf5dd7c7..075cd0b394 100644
--- a/src/panels/energy/strategies/energy-view-strategy.ts
+++ b/src/panels/energy/strategies/energy-view-strategy.ts
@@ -59,7 +59,9 @@ export class EnergyViewStrategy extends ReactiveElement {
         source.type === "grid" &&
         (!!source.stat_energy_from || !!source.stat_energy_to)
     );
-    const hasReturn = hasGrid && !!hasGrid.stat_energy_to;
+    const hasReturn = prefs.energy_sources.some(
+      (source) => source.type === "grid" && !!source.stat_energy_to
+    );
     const hasSolar = prefs.energy_sources.some(
       (source) => source.type === "solar"
     );