diff --git a/src/panels/lovelace/common/graph/coordinates.ts b/src/panels/lovelace/common/graph/coordinates.ts
index 56f525196502..d075835410cf 100644
--- a/src/panels/lovelace/common/graph/coordinates.ts
+++ b/src/panels/lovelace/common/graph/coordinates.ts
@@ -22,9 +22,16 @@ const calcPoints = (
   let xRatio = width / (hours - (detail === 1 ? 1 : 0));
   xRatio = isFinite(xRatio) ? xRatio : width;
 
-  const first = history.filter(Boolean)[0];
+  let first = history.filter(Boolean)[0];
+  if (detail > 1) {
+    first = first.filter(Boolean)[0];
+  }
   let last = [average(first), lastValue(first)];
 
+  const getY = (value: number): number => {
+    return height + strokeWidth / 2 - (value - min) / yRatio;
+  };
+
   const getCoords = (item: any[], i: number, offset = 0, depth = 1) => {
     if (depth > 1 && item) {
       return item.forEach((subItem, index) =>
@@ -37,8 +44,7 @@ const calcPoints = (
     if (item) {
       last = [average(item), lastValue(item)];
     }
-    const y =
-      height + strokeWidth / 2 - ((item ? last[0] : last[1]) - min) / yRatio;
+    const y = getY(item ? last[0] : last[1]);
     return coords.push([x, y]);
   };
 
@@ -46,11 +52,7 @@ const calcPoints = (
     getCoords(history[i], i, 0, detail);
   }
 
-  if (coords.length === 1) {
-    coords[1] = [width, coords[0][1]];
-  }
-
-  coords.push([width, coords[coords.length - 1][1]]);
+  coords.push([width, getY(last[1])]);
   return coords;
 };