diff --git a/src/BlazorUI/Bit.BlazorUI/Components/Navs/Pivot/BitPivot.razor b/src/BlazorUI/Bit.BlazorUI/Components/Navs/Pivot/BitPivot.razor
index 7a6c6e8d67..9e446fdd74 100644
--- a/src/BlazorUI/Bit.BlazorUI/Components/Navs/Pivot/BitPivot.razor
+++ b/src/BlazorUI/Bit.BlazorUI/Components/Navs/Pivot/BitPivot.razor
@@ -19,8 +19,8 @@
     {
         <div role="tabpanel"
              aria-hidden="false"
-             aria-labelledby="@GetAriaLabelledby"
              style="@GetSelectedItemStyle()"
+             aria-labelledby="@(_selectedItem?._Id)"
              class="bit-pvt-cct @GetSelectedItemClass()">
             @(_selectedItem?.Body ?? _selectedItem?.ChildContent)
         </div>
diff --git a/src/BlazorUI/Bit.BlazorUI/Components/Navs/Pivot/BitPivot.razor.cs b/src/BlazorUI/Bit.BlazorUI/Components/Navs/Pivot/BitPivot.razor.cs
index 2a42bdd6de..31430f964a 100644
--- a/src/BlazorUI/Bit.BlazorUI/Components/Navs/Pivot/BitPivot.razor.cs
+++ b/src/BlazorUI/Bit.BlazorUI/Components/Navs/Pivot/BitPivot.razor.cs
@@ -139,8 +139,6 @@ protected override async Task OnInitializedAsync()
 
 
 
-    internal string GetPivotItemId(BitPivotItem item) => $"Pivot-{UniqueId}-Tab-{_allItems.FindIndex(i => i == item)}";
-
     internal int GetPivotItemTabIndex(BitPivotItem item) => item.IsSelected ? 0 : _allItems.FindIndex(i => i == item) == 0 ? 0 : -1;
 
     internal void SelectItem(BitPivotItem item)
@@ -231,8 +229,6 @@ private string GetSelectedItemClass()
         return string.Join(' ', list.Where(s => s.HasValue()));
     }
 
-    private string GetAriaLabelledby => $"Pivot-{UniqueId}-Tab-{_allItems.FindIndex(i => i == _selectedItem)}";
-
     private void OnSetSelectedKey()
     {
         SelectItemByKey(SelectedKey);
diff --git a/src/BlazorUI/Bit.BlazorUI/Components/Navs/Pivot/BitPivotItem.razor b/src/BlazorUI/Bit.BlazorUI/Components/Navs/Pivot/BitPivotItem.razor
index 911a748b68..1d350fad5d 100644
--- a/src/BlazorUI/Bit.BlazorUI/Components/Navs/Pivot/BitPivotItem.razor
+++ b/src/BlazorUI/Bit.BlazorUI/Components/Navs/Pivot/BitPivotItem.razor
@@ -2,6 +2,7 @@
 @inherits BitComponentBase
 
 <button @ref="RootElement" @attributes="HtmlAttributes" @onclick="HandleOnClick"
+        id="@_Id"
         role="tab"
         type="button"
         name="@HeaderText"
@@ -9,7 +10,6 @@
         data-content="@HeaderText"
         style="@StyleBuilder.Value"
         class="@ClassBuilder.Value"
-        id="@Parent?.GetPivotItemId(this)"
         tabindex="@Parent?.GetPivotItemTabIndex(this)"
         aria-selected="@(IsSelected ? "true": "false")">
     <span style="@Parent?.Styles?.HeaderItemContent" class="@Parent?.Classes?.HeaderItemContent">