diff --git a/config/dashboards/overview/popups/lights.yaml b/config/dashboards/overview/popups/lights.yaml
index a185aac0..d84f92c2 100644
--- a/config/dashboards/overview/popups/lights.yaml
+++ b/config/dashboards/overview/popups/lights.yaml
@@ -8,6 +8,7 @@
 # -------------------------------------------------------------------
 # Notes: Keeps the popup hash stable with the `#ovw-*` convention.
 # Notes: Uses Bubble slider buttons for each light that is currently on.
+# Notes: Layout Card keeps the empty auto-entities hydration pass valid.
 ######################################################################
 
 type: custom:bubble-card
@@ -23,9 +24,14 @@ cards:
 - type: custom:auto-entities
   show_empty: true
   card:
-    type: grid
-    columns: 2
-    square: false
+    type: custom:layout-card
+    layout_type: custom:grid-layout
+    layout:
+      grid-template-columns: repeat(2, minmax(0, 1fr))
+      grid-auto-flow: row
+      grid-auto-rows: min-content
+      grid-gap: 8px
+      margin: 0
   card_param: cards
   filter:
     include: