diff --git a/app/react/components/buttons/Button.tsx b/app/react/components/buttons/Button.tsx
index f45d8b0e3..acd9d4f61 100644
--- a/app/react/components/buttons/Button.tsx
+++ b/app/react/components/buttons/Button.tsx
@@ -63,7 +63,11 @@ export function Button<TasProps = unknown>({
       type={type}
       disabled={disabled}
       className={clsx(`btn btn-${color}`, sizeClass(size), className)}
-      onClick={onClick}
+      onClick={(e) => {
+        if (!disabled) {
+          onClick?.(e);
+        }
+      }}
       title={title}
       // eslint-disable-next-line react/jsx-props-no-spreading
       {...ariaProps}