diff --git a/src/components/data-table/ha-data-table.ts b/src/components/data-table/ha-data-table.ts
index 4278562171..af1f1f358b 100644
--- a/src/components/data-table/ha-data-table.ts
+++ b/src/components/data-table/ha-data-table.ts
@@ -515,7 +515,7 @@ export class HaDataTable extends LitElement {
       return html`<div class="mdc-data-table__row">${row.content}</div>`;
     }
     if (row.empty) {
-      return html`<div class="mdc-data-table__row"></div>`;
+      return html`<div class="mdc-data-table__row empty-row"></div>`;
     }
     return html`
       <div
@@ -960,6 +960,13 @@ export class HaDataTable extends LitElement {
           width: var(--table-row-width, 100%);
         }
 
+        .mdc-data-table__row.empty-row {
+          height: var(
+            --data-table-empty-row-height,
+            var(--data-table-row-height, 52px)
+          );
+        }
+
         .mdc-data-table__row ~ .mdc-data-table__row {
           border-top: 1px solid var(--divider-color);
         }
diff --git a/src/layouts/hass-tabs-subpage.ts b/src/layouts/hass-tabs-subpage.ts
index b69610b5e3..4c4d1e3cdc 100644
--- a/src/layouts/hass-tabs-subpage.ts
+++ b/src/layouts/hass-tabs-subpage.ts
@@ -314,6 +314,10 @@ class HassTabsSubpage extends LitElement {
           width: calc(
             100% - env(safe-area-inset-left) - env(safe-area-inset-right)
           );
+          height: calc(100% - var(--header-height));
+          height: calc(
+            100% - var(--header-height) - env(safe-area-inset-bottom)
+          );
           margin-left: env(safe-area-inset-left);
           margin-right: env(safe-area-inset-right);
           margin-inline-start: env(safe-area-inset-left);