diff --git a/src/BootstrapBlazor/BootstrapBlazor.csproj b/src/BootstrapBlazor/BootstrapBlazor.csproj
index 536c74f936a..96248a6ef6e 100644
--- a/src/BootstrapBlazor/BootstrapBlazor.csproj
+++ b/src/BootstrapBlazor/BootstrapBlazor.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <Version>9.8.0-beta04</Version>
+    <Version>9.8.0-beta05</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/BootstrapBlazor/Components/Tab/TabItemContent.cs b/src/BootstrapBlazor/Components/Tab/TabItemContent.cs
index 72bf49a2232..49d981eb3ef 100644
--- a/src/BootstrapBlazor/Components/Tab/TabItemContent.cs
+++ b/src/BootstrapBlazor/Components/Tab/TabItemContent.cs
@@ -50,18 +50,10 @@ private void RenderContent()
     private Guid _key = Guid.NewGuid();
 
     private void BuildRenderTree(RenderTreeBuilder builder)
-    {
-        builder.OpenElement(0, "div");
-        builder.SetKey(_key);
-        builder.AddAttribute(5, "class", "tabs-body-content-wrap");
-        builder.AddContent(10, RenderItemContent(Item.ChildContent));
-        builder.CloseElement();
-    }
-
-    private RenderFragment RenderItemContent(RenderFragment? content) => builder =>
     {
         builder.OpenComponent<ErrorLogger>(0);
-        builder.AddAttribute(1, nameof(ErrorLogger.ChildContent), content);
+        builder.SetKey(_key);
+        builder.AddAttribute(1, nameof(ErrorLogger.ChildContent), Item.ChildContent);
 
         var enableErrorLogger = TabSet.EnableErrorLogger ?? Options.CurrentValue.EnableErrorLogger;
         builder.AddAttribute(2, nameof(ErrorLogger.EnableErrorLogger), enableErrorLogger);
@@ -76,7 +68,7 @@ private RenderFragment RenderItemContent(RenderFragment? content) => builder =>
             return Task.CompletedTask;
         }));
         builder.CloseComponent();
-    };
+    }
 
     /// <summary>
     /// Render method
diff --git a/test/UnitTest/Components/TabTest.cs b/test/UnitTest/Components/TabTest.cs
index fb18a2cb51f..a34a83185bf 100644
--- a/test/UnitTest/Components/TabTest.cs
+++ b/test/UnitTest/Components/TabTest.cs
@@ -191,20 +191,20 @@ public async Task IsLoopSwitchTabItem_Ok()
                 pb.Add(a => a.ChildContent, "Tab2-Content");
             });
         });
-        Assert.Equal("Tab2-Content", cut.Find(".tabs-body .d-none .tabs-body-content-wrap").InnerHtml);
+        Assert.Equal("Tab2-Content", cut.Find(".tabs-body .tabs-body-content.d-none").InnerHtml);
 
         // Click Prev
         var button = cut.Find(".nav-link-bar.left .nav-link-bar-button");
         await cut.InvokeAsync(() => button.Click());
-        Assert.Equal("Tab2-Content", cut.Find(".tabs-body .d-none .tabs-body-content-wrap").InnerHtml);
+        Assert.Equal("Tab2-Content", cut.Find(".tabs-body .tabs-body-content.d-none").InnerHtml);
 
         // Click Next
         button = cut.Find(".nav-link-bar.right .nav-link-bar-button");
         await cut.InvokeAsync(() => button.Click());
-        Assert.Equal("Tab1-Content", cut.Find(".tabs-body .d-none .tabs-body-content-wrap").InnerHtml);
+        Assert.Equal("Tab1-Content", cut.Find(".tabs-body .tabs-body-content.d-none").InnerHtml);
 
         await cut.InvokeAsync(() => button.Click());
-        Assert.Equal("Tab1-Content", cut.Find(".tabs-body .d-none .tabs-body-content-wrap").InnerHtml);
+        Assert.Equal("Tab1-Content", cut.Find(".tabs-body .tabs-body-content.d-none").InnerHtml);
     }
 
     [Fact]
@@ -240,7 +240,7 @@ public void ClickTab_Ok()
                 pb.Add(a => a.ChildContent, "Tab2-Content");
             });
         });
-        Assert.Equal("Tab2-Content", cut.Find(".tabs-body .d-none .tabs-body-content-wrap").InnerHtml);
+        Assert.Equal("Tab2-Content", cut.Find(".tabs-body .tabs-body-content.d-none").InnerHtml);
 
         // Click TabItem
         cut.Find(".tabs-item").Click();
@@ -251,14 +251,14 @@ public void ClickTab_Ok()
         button.Click();
         button.Click();
         button.Click();
-        Assert.Equal("Tab1-Content", cut.Find(".tabs-body .d-none .tabs-body-content-wrap").InnerHtml);
+        Assert.Equal("Tab1-Content", cut.Find(".tabs-body .tabs-body-content.d-none").InnerHtml);
 
         // Click Next
         button = cut.Find(".nav-link-bar.right .nav-link-bar-button");
         button.Click();
         button.Click();
         button.Click();
-        Assert.Equal("Tab2-Content", cut.Find(".tabs-body .d-none .tabs-body-content-wrap").InnerHtml);
+        Assert.Equal("Tab2-Content", cut.Find(".tabs-body .tabs-body-content.d-none").InnerHtml);
 
         // Close
         Assert.Null(closedItem);
@@ -342,7 +342,7 @@ public void AddTab_Ok()
 
         cut.InvokeAsync(() => tab.AddTab("/", "Tab2", "fa-solid fa-font-awesome", false, true));
         cut.InvokeAsync(() => tab.CloseOtherTabs());
-        Assert.Equal("Tab1-Body", cut.Find(".tabs-body-content .tabs-body-content-wrap").InnerHtml);
+        Assert.Equal("Tab1-Body", cut.Find(".tabs-body-content").InnerHtml);
 
         // NotFound
         cut.InvokeAsync(() => tab.AddTab("/Test", "Tab3", "fa-solid fa-font-awesome", false, true));