diff --git a/src/BootstrapBlazor/BootstrapBlazor.csproj b/src/BootstrapBlazor/BootstrapBlazor.csproj
index 4b1d7754056..f63bb207b2e 100644
--- a/src/BootstrapBlazor/BootstrapBlazor.csproj
+++ b/src/BootstrapBlazor/BootstrapBlazor.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <Version>9.4.7-beta01</Version>
+    <Version>9.4.7-beta02</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/BootstrapBlazor/Components/Modal/Modal.razor.js b/src/BootstrapBlazor/Components/Modal/Modal.razor.js
index 9a2da09f40c..5773fff818d 100644
--- a/src/BootstrapBlazor/Components/Modal/Modal.razor.js
+++ b/src/BootstrapBlazor/Components/Modal/Modal.razor.js
@@ -137,8 +137,13 @@ export function dispose(id) {
         }
 
         EventHandler.off(window, 'popstate', modal.pop)
-        if (modal.modal) {
-            modal.modal.dispose()
+        const dialog = modal.modal;
+        if (dialog) {
+            if (document.body.classList.contains('modal-open')) {
+                dialog._backdrop._config.isAnimated = false;
+                dialog._hideModal();
+            }
+            dialog.dispose()
         }
     }
 }