diff --git a/src/components/chart/statistics-chart.ts b/src/components/chart/statistics-chart.ts
index 13e5e92a58..6d4db48c70 100644
--- a/src/components/chart/statistics-chart.ts
+++ b/src/components/chart/statistics-chart.ts
@@ -267,7 +267,12 @@ class StatisticsChart extends LitElement {
       stats.forEach((stat) => {
         const dataValues: Array<number | null> = [];
         statTypes.forEach((type) => {
-          const val = stat[type];
+          let val: number | null;
+          if (type === "sum") {
+            val = stat.state;
+          } else {
+            val = stat[type];
+          }
           dataValues.push(val !== null ? Math.round(val * 100) / 100 : null);
         });
         const date = new Date(stat.start);
diff --git a/src/panels/lovelace/cards/hui-statistics-graph-card.ts b/src/panels/lovelace/cards/hui-statistics-graph-card.ts
index b475097634..5ff105a67c 100644
--- a/src/panels/lovelace/cards/hui-statistics-graph-card.ts
+++ b/src/panels/lovelace/cards/hui-statistics-graph-card.ts
@@ -146,7 +146,10 @@ export class HuiStatisticsGraphCard extends LitElement implements LovelaceCard {
       return;
     }
     const startDate = new Date();
-    startDate.setHours(-24 * (this._config!.days_to_show || 30));
+    startDate.setTime(
+      startDate.getTime() -
+        1000 * 60 * 60 * (24 * (this._config!.days_to_show || 30) + 1)
+    );
     this._fetching = true;
     try {
       this._statistics = await fetchStatistics(