diff --git a/src/BootstrapBlazor/BootstrapBlazor.csproj b/src/BootstrapBlazor/BootstrapBlazor.csproj
index c67cddcd1f7d4d10b220a8b7a484ac903eb6c467..3aa578101795f0ab66d63aaa9fed67250195326e 100644
--- a/src/BootstrapBlazor/BootstrapBlazor.csproj
+++ b/src/BootstrapBlazor/BootstrapBlazor.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <Version>6.6.16</Version>
+    <Version>6.6.17</Version>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
diff --git a/src/BootstrapBlazor/Components/Tab/Tab.razor b/src/BootstrapBlazor/Components/Tab/Tab.razor
index 4f49ce0c59a4c9f5a20794b1b8dc09e942d70409..ad0016ef96db3b0d7378ae957af1970840cca17a 100644
--- a/src/BootstrapBlazor/Components/Tab/Tab.razor
+++ b/src/BootstrapBlazor/Components/Tab/Tab.razor
@@ -24,12 +24,9 @@ else
                         {
                             <div class="tabs-active-bar"></div>
                         }
-                        @if (FirstRender)
-                        {
-                            <CascadingValue Value="this" IsFixed="true">
-                                @ChildContent
-                            </CascadingValue>
-                        }
+                        <CascadingValue Value="this" IsFixed="true">
+                            @ChildContent
+                        </CascadingValue>
                         <RenderTemplate>
                             @if (!Items.Any() && !string.IsNullOrEmpty(DefaultUrl))
                             {
@@ -86,29 +83,29 @@ else
         <div class="tabs-body">
             <CascadingValue Value="this" IsFixed="true">
                 @if (IsOnlyRenderActiveTab)
-            {
-                var item = Items.FirstOrDefault(i => i.IsActive);
-                if (item != null)
                 {
-                    <div class="@GetContentClassString(item)">
-                        <CascadingValue Value="item" IsFixed="true">
-                            @RenderTabItemContent(item.ChildContent)
-                        </CascadingValue>
-                    </div>
+                    var item = Items.FirstOrDefault(i => i.IsActive);
+                    if (item != null)
+                    {
+                        <div class="@GetContentClassString(item)">
+                            <CascadingValue Value="item" IsFixed="true">
+                                @RenderTabItemContent(item.ChildContent)
+                            </CascadingValue>
+                        </div>
+                    }
                 }
-            }
-            else
-            {
-                foreach (var item in Items)
+                else
                 {
-                    <div @key="@item" class="@GetContentClassString(item)">
-                        <CascadingValue Value="item" IsFixed="true">
-                            @RenderTabItemContent(item.ChildContent)
-                        </CascadingValue>
-                    </div>
+                    foreach (var item in Items)
+                    {
+                        <div @key="@item" class="@GetContentClassString(item)">
+                            <CascadingValue Value="item" IsFixed="true">
+                                @RenderTabItemContent(item.ChildContent)
+                            </CascadingValue>
+                        </div>
+                    }
                 }
-            }
-        </CascadingValue>
+            </CascadingValue>
+        </div>
     </div>
-</div>
 }