diff --git a/src/BootstrapBlazor.Server/Components/Samples/SortableLists.razor b/src/BootstrapBlazor.Server/Components/Samples/SortableLists.razor
index cb7c0531aa7..35415f8822d 100644
--- a/src/BootstrapBlazor.Server/Components/Samples/SortableLists.razor
+++ b/src/BootstrapBlazor.Server/Components/Samples/SortableLists.razor
@@ -186,8 +186,8 @@
 <DemoBlock Title="@Localizer["SortableListTableTitle"]"
            Introduction="@Localizer["SortableListTableIntro"]"
            Name="Table">
-    <SortableList Option="_optionTable">
-        <Table TItem="Foo" Items="@Items.Take(3)" IsStriped="true">
+    <SortableList Option="_optionTable" OnUpdate="OnUpdateTable">
+        <Table TItem="Foo" Items="@Items" IsStriped="true" ShowLineNo="true">
             <TableColumns>
                 <TableColumn @bind-Field="@context.DateTime" Width="180" />
                 <TableColumn @bind-Field="@context.Name" />
diff --git a/src/BootstrapBlazor.Server/Components/Samples/SortableLists.razor.cs b/src/BootstrapBlazor.Server/Components/Samples/SortableLists.razor.cs
index 6dedbd39e24..17b63a0ecb6 100644
--- a/src/BootstrapBlazor.Server/Components/Samples/SortableLists.razor.cs
+++ b/src/BootstrapBlazor.Server/Components/Samples/SortableLists.razor.cs
@@ -136,6 +136,16 @@ protected override void OnInitialized()
         AddItems3 = Foo.GenerateFoo(FooLocalizer, 12).Skip(8).ToList();
     }
 
+    private Task OnUpdateTable(SortableEvent @event)
+    {
+        var oldItem = Items[@event.OldIndex];
+        Items.Remove(oldItem);
+        Items.Insert(@event.NewIndex, oldItem);
+
+        StateHasChanged();
+        return Task.CompletedTask;
+    }
+
     private Task OnUpdate(SortableEvent @event)
     {
         var oldIndex = @event.OldIndex;
diff --git a/src/BootstrapBlazor/Components/Table/Table.razor b/src/BootstrapBlazor/Components/Table/Table.razor
index 51d31552a62..80d1bc0bed6 100644
--- a/src/BootstrapBlazor/Components/Table/Table.razor
+++ b/src/BootstrapBlazor/Components/Table/Table.razor
@@ -237,7 +237,7 @@
                         }
                         else
                         {
-                            <DynamicElement class="@GetRowClassString(item, "table-row")"
+                            <DynamicElement class="@GetRowClassString(item, "table-row")" @key="item"
                                             TriggerContextMenu="ContextMenuZone != null" OnContextMenu="e => OnContextMenu(e, item)"
                                             @ontouchstart="e => OnTouchStart(e, item)"
                                             @ontouchend="OnTouchEnd"
@@ -675,7 +675,7 @@
     </thead>;
 
     RenderFragment<TItem> RenderRow => item =>
-    @<DynamicElement TagName="tr" class="@GetRowClassString(item)"
+    @<DynamicElement TagName="tr" class="@GetRowClassString(item)" @key="item"
                      TriggerContextMenu="ContextMenuZone != null" OnContextMenu="e => OnContextMenu(e, item)"
                      @ontouchstart="e => OnTouchStart(e, item)" @ontouchend="OnTouchEnd"
                      TriggerClick="@(ClickToSelect || OnClickRowCallback != null)" OnClick="() => ClickRow(item)"
diff --git a/test/UnitTest/Components/TableTest.cs b/test/UnitTest/Components/TableTest.cs
index b4f5431c0ee..7307b321c39 100644
--- a/test/UnitTest/Components/TableTest.cs
+++ b/test/UnitTest/Components/TableTest.cs
@@ -4582,6 +4582,7 @@ public async Task KeepSelectedRows_Ok()
         await cut.InvokeAsync(() => nextBtn.Click());
 
         //选中行数为空
+        inputs = cut.FindComponents<Checkbox<Foo>>();
         checkboxs = inputs.Count(i => i.Instance.State == CheckboxState.Checked);
         Assert.Equal(0, checkboxs);
 
@@ -4593,6 +4594,7 @@ public async Task KeepSelectedRows_Ok()
         await cut.InvokeAsync(input.Instance.OnToggleClick);
 
         //加上表头的复选框选中，结果有3项
+        inputs = cut.FindComponents<Checkbox<Foo>>();
         checkboxs = inputs.Count(i => i.Instance.State == CheckboxState.Checked);
         Assert.Equal(3, checkboxs);
 
@@ -4601,6 +4603,7 @@ public async Task KeepSelectedRows_Ok()
         await cut.InvokeAsync(() => prevBtn.Click());
 
         //恢复选中行数为0
+        inputs = cut.FindComponents<Checkbox<Foo>>();
         checkboxs = inputs.Count(i => i.Instance.State == CheckboxState.Checked);
         Assert.Equal(0, checkboxs);
 
@@ -4608,6 +4611,7 @@ public async Task KeepSelectedRows_Ok()
         await cut.InvokeAsync(() => prevBtn.Click());
 
         //恢复选中行数为1
+        inputs = cut.FindComponents<Checkbox<Foo>>();
         checkboxs = inputs.Count(i => i.Instance.State == CheckboxState.Checked);
         Assert.Equal(1, checkboxs);
 
@@ -4615,6 +4619,7 @@ public async Task KeepSelectedRows_Ok()
         await cut.InvokeAsync(() => nextBtn.Click());
 
         //恢复选中行数为0
+        inputs = cut.FindComponents<Checkbox<Foo>>();
         checkboxs = inputs.Count(i => i.Instance.State == CheckboxState.Checked);
         Assert.Equal(0, checkboxs);
 
@@ -4622,6 +4627,7 @@ public async Task KeepSelectedRows_Ok()
         await cut.InvokeAsync(() => nextBtn.Click());
 
         //恢复选中行数为2，加上表头的复选框选中，结果有3项
+        inputs = cut.FindComponents<Checkbox<Foo>>();
         checkboxs = inputs.Count(i => i.Instance.State == CheckboxState.Checked);
         Assert.Equal(3, checkboxs);
     }