diff --git a/src/panels/lovelace/cards/energy/hui-energy-devices-detail-graph-card.ts b/src/panels/lovelace/cards/energy/hui-energy-devices-detail-graph-card.ts
index 0e0b60b16a..42edcdaacc 100644
--- a/src/panels/lovelace/cards/energy/hui-energy-devices-detail-graph-card.ts
+++ b/src/panels/lovelace/cards/energy/hui-energy-devices-detail-graph-card.ts
@@ -447,9 +447,9 @@ export class HuiEnergyDevicesDetailGraphCard
         stack: compare ? "devicesCompare" : "devices",
       });
     });
-    return sorted_devices.map(
-      (device) => data.find((d) => (d.id as string).includes(device))!
-    );
+    return sorted_devices
+      .map((device) => data.find((d) => (d.id as string).includes(device))!)
+      .filter(Boolean);
   }
 
   static styles = css`