diff --git a/src/components/chart/ha-chart-base.ts b/src/components/chart/ha-chart-base.ts
index 9666902885..4988ff75c8 100644
--- a/src/components/chart/ha-chart-base.ts
+++ b/src/components/chart/ha-chart-base.ts
@@ -540,7 +540,7 @@ export class HaChartBase extends LitElement {
     }
     .chart-container {
       position: relative;
-      max-height: var(--chart-max-height, 300px);
+      max-height: var(--chart-max-height, 350px);
     }
     .chart {
       width: 100%;
diff --git a/src/panels/lovelace/cards/hui-history-graph-card.ts b/src/panels/lovelace/cards/hui-history-graph-card.ts
index 818554dfaa..0907d60254 100644
--- a/src/panels/lovelace/cards/hui-history-graph-card.ts
+++ b/src/panels/lovelace/cards/hui-history-graph-card.ts
@@ -260,6 +260,7 @@ export class HuiHistoryGraphCard extends LitElement implements LovelaceCard {
         <div
           class="content ${classMap({
             "has-header": !!this._config.title,
+            "has-rows": !!this._config.grid_options?.rows,
           })}"
         >
           ${this._error
@@ -320,6 +321,9 @@ export class HuiHistoryGraphCard extends LitElement implements LovelaceCard {
       height: 100%;
       --timeline-top-margin: 16px;
     }
+    .has-rows {
+      --chart-max-height: 100%;
+    }
   `;
 }