diff --git a/src/BootstrapBlazor/BootstrapBlazor.csproj b/src/BootstrapBlazor/BootstrapBlazor.csproj
index c172cd81627..0848b855249 100644
--- a/src/BootstrapBlazor/BootstrapBlazor.csproj
+++ b/src/BootstrapBlazor/BootstrapBlazor.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <Version>10.6.1-beta08</Version>
+    <Version>10.6.1-beta09</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/BootstrapBlazor/Components/Table/Table.razor.js b/src/BootstrapBlazor/Components/Table/Table.razor.js
index c43481f372d..ccd836f745c 100644
--- a/src/BootstrapBlazor/Components/Table/Table.razor.js
+++ b/src/BootstrapBlazor/Components/Table/Table.razor.js
@@ -91,33 +91,6 @@ export async function reset(id) {
         table.loopCheckHeightHandler = requestAnimationFrame(() => check(table));
         return;
     }
-
-    observeHeight(table)
-}
-
-const observeHeight = table => {
-    setBodyHeight(table);
-
-    const observer = new ResizeObserver(entries => {
-        entries.forEach(entry => {
-            if (entry.target === table.search || entry.target === table.toolbar || entry.target === table.pages) {
-                setBodyHeight(table)
-            }
-        });
-    });
-    if (table.thead) {
-        observer.observe(table.shim);
-    }
-    if (table.search) {
-        observer.observe(table.search);
-    }
-    if (table.toolbar) {
-        observer.observe(table.toolbar);
-    }
-    if (table.pages) {
-        observer.observe(table.pages);
-    }
-    table.observer = observer;
 }
 
 export async function switchCardView(id) {
@@ -161,11 +134,6 @@ const destroyTable = table => {
         if (table.handlers.setColumnToolboxHandler) {
             EventHandler.off(document, 'click', table.handlers.setColumnToolboxHandler);
         }
-        if (table.observer) {
-            table.observer.disconnect();
-            table.observer = null;
-        }
-
         if (table.popovers) {
             table.popovers.forEach(p => {
                 Popover.dispose(p)
diff --git a/src/BootstrapBlazor/Components/Table/Table.razor.scss b/src/BootstrapBlazor/Components/Table/Table.razor.scss
index e5ff775a1e0..d711ad452fb 100644
--- a/src/BootstrapBlazor/Components/Table/Table.razor.scss
+++ b/src/BootstrapBlazor/Components/Table/Table.razor.scss
@@ -1,5 +1,5 @@
 .dropdown-menu-popover {
-  --bb-table-columnlist-max-height: var(--bb-dropdown-max-height);
+    --bb-table-columnlist-max-height: var(--bb-dropdown-max-height);
 }
 
 .table-container {
@@ -31,6 +31,8 @@
     --bb-table-pagination-active-border-color: rgba(var(--bs-body-color-rgb), .15);
     position: relative;
     height: 100%;
+    display: flex;
+    flex-direction: column;
 
     .nav-pages {
         margin-block-start: .5rem;
@@ -48,6 +50,20 @@
             overflow: auto;
         }
     }
+
+    .table-shim {
+        display: flex;
+        flex-direction: column;
+        flex: 1;
+        min-height: 0;
+        height: 1%;
+
+        > .table-fixed-body {
+            flex: 1;
+            min-height: 0;
+            height: 1%;
+        }
+    }
 }
 
 .table-container .table:not(.table-excel) .switch {