Merge branch 'main' of https://github.com/flixlix/energy-flow-card-plus

flixlix · May 27, 2023 · 574576c · 574576c
2 parents a477468 + 0c0f252
commit 574576c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/energy-flow-card-plus.ts b/src/energy-flow-card-plus.ts
@@ -291,7 +291,7 @@ export default class EnergyFlowCardPlus extends SubscribeMixin(LitElement) {
  return html``;
  }
 
- if (!this._data) {
+ if (!this._data && this._config.energy_date_selection !== false) {
  return html`${this.hass.localize('ui.panel.lovelace.cards.energy.loading')}`;
  }
 
@@ -891,7 +891,7 @@ export default class EnergyFlowCardPlus extends SubscribeMixin(LitElement) {
  : this.displayValue(totalHomeConsumption);
 
  let lowCarbonPercentage: number | undefined;
- if (this._data.co2SignalEntity && this._data.fossilEnergyConsumption) {
+ if (this._data && this._data.co2SignalEntity && this._data.fossilEnergyConsumption) {
  // Calculate high carbon consumption
  const highCarbonEnergy = Object.values(this._data.fossilEnergyConsumption).reduce((sum, a) => sum + a, 0) * 1000;