diff --git a/src/BootstrapBlazor/BootstrapBlazor.csproj b/src/BootstrapBlazor/BootstrapBlazor.csproj
index 9ee05758396..27feba134e6 100644
--- a/src/BootstrapBlazor/BootstrapBlazor.csproj
+++ b/src/BootstrapBlazor/BootstrapBlazor.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <Version>9.6.4-beta04</Version>
+    <Version>9.6.4-beta05</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/BootstrapBlazor/Components/Checkbox/CheckboxListGeneric.razor.cs b/src/BootstrapBlazor/Components/Checkbox/CheckboxListGeneric.razor.cs
index b4929a21be0..7d5766f0288 100644
--- a/src/BootstrapBlazor/Components/Checkbox/CheckboxListGeneric.razor.cs
+++ b/src/BootstrapBlazor/Components/Checkbox/CheckboxListGeneric.razor.cs
@@ -187,22 +187,7 @@ private async Task<bool> OnBeforeStateChanged(CheckboxState state)
     private async Task OnStateChanged(SelectedItem<TValue> item, bool v)
     {
         item.Active = v;
-        var items = new List<TValue>();
-        if (Value != null)
-        {
-            items.AddRange(Value);
-        }
-
-        var val = items.Find(i => Equals(item.Value, i));
-        if (v && val == null)
-        {
-            items.Add(item.Value);
-        }
-        else
-        {
-            items.Remove(val!);
-        }
-
+        var items = Items.Where(i => i.Active).Select(i => i.Value).ToList();
         CurrentValue = items;
 
         if (OnSelectedChanged != null)
diff --git a/test/UnitTest/Components/SelectTest.cs b/test/UnitTest/Components/SelectTest.cs
index 5cd20702bb6..748c7be025c 100644
--- a/test/UnitTest/Components/SelectTest.cs
+++ b/test/UnitTest/Components/SelectTest.cs
@@ -1167,6 +1167,7 @@ public async Task OnBeforeSelectedItemChange_OK()
                 pb.Add(a => a.SwalCategory, SwalCategory.Question);
                 pb.Add(a => a.SwalTitle, "Swal-Title");
                 pb.Add(a => a.SwalContent, "Swal-Content");
+                pb.Add(a => a.ShowSwal, true);
                 pb.Add(a => a.OnBeforeSelectedItemChange, item => Task.FromResult(true));
                 pb.Add(a => a.OnSelectedItemChanged, item => Task.CompletedTask);
                 pb.Add(a => a.SwalFooter, "test-swal-footer");