diff --git a/src/panels/lovelace/cards/energy/hui-energy-devices-graph-card.ts b/src/panels/lovelace/cards/energy/hui-energy-devices-graph-card.ts
index fc987b3300..708514d836 100644
--- a/src/panels/lovelace/cards/energy/hui-energy-devices-graph-card.ts
+++ b/src/panels/lovelace/cards/energy/hui-energy-devices-graph-card.ts
@@ -244,7 +244,10 @@ export class HuiEnergyDevicesGraphCard
 
     chartData.sort((a: any, b: any) => b.value[0] - a.value[0]);
 
-    chartData.length = this._config?.max_devices || chartData.length;
+    chartData.length = Math.min(
+      this._config?.max_devices || Infinity,
+      chartData.length
+    );
 
     this._chartData = datasets;
     await this.updateComplete;