diff --git a/frontend/src/app/main/ui/ds/buttons/button.cljs b/frontend/src/app/main/ui/ds/buttons/button.cljs
index 237b4c5e23..16165e0a52 100644
--- a/frontend/src/app/main/ui/ds/buttons/button.cljs
+++ b/frontend/src/app/main/ui/ds/buttons/button.cljs
@@ -34,6 +34,7 @@
                                      :button-ghost (= variant "ghost")
                                      :button-destructive (= variant "destructive"))
         props (mf/spread-props props {:class [class internal-class]
+                                      :type (when-not to "button")
                                       :href to
                                       :ref (fn [node]
                                              (when on-ref
diff --git a/frontend/src/app/main/ui/ds/buttons/button.stories.jsx b/frontend/src/app/main/ui/ds/buttons/button.stories.jsx
index d41e12c2de..03a00f7405 100644
--- a/frontend/src/app/main/ui/ds/buttons/button.stories.jsx
+++ b/frontend/src/app/main/ui/ds/buttons/button.stories.jsx
@@ -6,6 +6,7 @@
 
 import * as React from "react";
 import Components from "@target/components";
+import { fn } from 'storybook/test';
 
 const { Button } = Components;
 const { icons } = Components.meta;
@@ -28,6 +29,7 @@ export default {
     children: "Lorem ipsum",
     disabled: false,
     variant: undefined,
+    onClick: fn(),
   },
   parameters: {
     controls: { exclude: ["children"] },