diff --git a/src/data/energy.ts b/src/data/energy.ts index 5e082ac675..8cee433211 100644 --- a/src/data/energy.ts +++ b/src/data/energy.ts @@ -401,7 +401,13 @@ const getEnergyData = async ( const dayDifference = differenceInDays(end || new Date(), start); const period = - dayDifference > 35 ? "month" : dayDifference > 2 ? "day" : "hour"; + isFirstDayOfMonth(start) && + (!end || isLastDayOfMonth(end)) && + dayDifference > 35 + ? "month" + : dayDifference > 2 + ? "day" + : "hour"; const lengthUnit = hass.config.unit_system.length || ""; const energyUnits: StatisticsUnitConfiguration = {