diff --git a/src/panels/lovelace/cards/hui-weather-forecast-card.ts b/src/panels/lovelace/cards/hui-weather-forecast-card.ts
index fadca1dd5a..0f0c5d76b5 100644
--- a/src/panels/lovelace/cards/hui-weather-forecast-card.ts
+++ b/src/panels/lovelace/cards/hui-weather-forecast-card.ts
@@ -430,6 +430,14 @@ class HuiWeatherForecastCard extends LitElement implements LovelaceCard {
       this._config?.show_current !== false &&
       this._config?.show_forecast !== false
     ) {
+      return {
+        grid_columns: 4,
+        grid_min_columns: 2,
+        grid_rows: 4,
+        grid_min_rows: 4,
+      };
+    }
+    if (this._config?.show_forecast !== false) {
       return {
         grid_columns: 4,
         grid_min_columns: 2,
@@ -441,7 +449,7 @@ class HuiWeatherForecastCard extends LitElement implements LovelaceCard {
       grid_columns: 4,
       grid_min_columns: 2,
       grid_rows: 2,
-      grid_min_rows: 1,
+      grid_min_rows: 2,
     };
   }