diff --git a/src/BootstrapBlazor/Components/Button/ButtonBase.cs b/src/BootstrapBlazor/Components/Button/ButtonBase.cs
index 31f97e4be12..a854bdb69c6 100644
--- a/src/BootstrapBlazor/Components/Button/ButtonBase.cs
+++ b/src/BootstrapBlazor/Components/Button/ButtonBase.cs
@@ -3,8 +3,6 @@
 // See the LICENSE file in the project root for more information.
 // Maintainer: Argo Zhang(argo@live.ca) Website: https://www.blazor.zone
 
-using Microsoft.AspNetCore.Components.Web;
-
 namespace BootstrapBlazor.Components;
 
 /// <summary>
@@ -65,7 +63,7 @@ public abstract class ButtonBase : TooltipWrapperBase
     /// <para lang="en">Gets or sets the OnClick event</para>
     /// </summary>
     [Parameter]
-    public EventCallback<MouseEventArgs> OnClick { get; set; }
+    public EventCallback OnClick { get; set; }
 
     /// <summary>
     /// <para lang="zh">获得/设置 OnClick 事件不刷新父组件</para>
@@ -206,8 +204,7 @@ protected override void OnInitialized()
     }
 
     /// <summary>
-    /// <para lang="zh">OnParametersSet 方法</para>
-    /// <para lang="en">OnParametersSet method</para>
+    /// <inheritdoc/>
     /// </summary>
     protected override void OnParametersSet()
     {
@@ -223,8 +220,7 @@ protected override void OnParametersSet()
 
     private bool _prevDisable;
     /// <summary>
-    /// <para lang="zh">OnAfterRenderAsync 方法</para>
-    /// <para lang="en">OnAfterRenderAsync method</para>
+    /// <inheritdoc/>
     /// </summary>
     /// <param name="firstRender"></param>
     protected override async Task OnAfterRenderAsync(bool firstRender)
@@ -329,14 +325,23 @@ public virtual async Task RemoveTooltip()
     }
 
     /// <summary>
-    /// <para lang="zh">DisposeAsyncCore 方法</para>
-    /// <para lang="en">DisposeAsyncCore method</para>
+    /// <inheritdoc/>
     /// </summary>
     /// <param name="disposing"></param>
     protected override async ValueTask DisposeAsync(bool disposing)
     {
         if (disposing)
         {
+            if (OnClick.HasDelegate)
+            {
+                OnClick = EventCallback.Empty;
+            }
+
+            if (IsAsync && ValidateForm != null)
+            {
+                ValidateForm.UnregisterAsyncSubmitButton(this);
+            }
+
             await RemoveTooltip();
         }
         await base.DisposeAsync(disposing);