diff --git a/src/BootstrapBlazor/BootstrapBlazor.csproj b/src/BootstrapBlazor/BootstrapBlazor.csproj
index 374b1505436..5e3224ba93a 100644
--- a/src/BootstrapBlazor/BootstrapBlazor.csproj
+++ b/src/BootstrapBlazor/BootstrapBlazor.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <Version>9.2.5-beta02</Version>
+    <Version>9.2.5</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/BootstrapBlazor/Components/AutoComplete/AutoComplete.razor.cs b/src/BootstrapBlazor/Components/AutoComplete/AutoComplete.razor.cs
index 47f7830a3a9..d6ccbf279c7 100644
--- a/src/BootstrapBlazor/Components/AutoComplete/AutoComplete.razor.cs
+++ b/src/BootstrapBlazor/Components/AutoComplete/AutoComplete.razor.cs
@@ -115,7 +115,7 @@ protected override void OnParametersSet()
         PlaceHolder ??= Localizer[nameof(PlaceHolder)];
         Icon ??= IconTheme.GetIconByKey(ComponentIcons.AutoCompleteIcon);
 
-        FilterItems = Items?.ToList() ?? [];
+        FilterItems ??= Items?.ToList() ?? [];
     }
 
     /// <summary>
@@ -145,9 +145,11 @@ public async Task TriggerOnChange(string val)
         else
         {
             var comparison = IgnoreCase ? StringComparison.OrdinalIgnoreCase : StringComparison.Ordinal;
-            var items = IsLikeMatch
-                ? Items.Where(s => s.Contains(val, comparison))
-                : Items.Where(s => s.StartsWith(val, comparison));
+            var items = string.IsNullOrEmpty(val)
+                ? Items
+                : IsLikeMatch
+                    ? Items.Where(s => s.Contains(val, comparison))
+                    : Items.Where(s => s.StartsWith(val, comparison));
             FilterItems = items.ToList();
         }