diff --git a/packages/client/src/components/app/Button.svelte b/packages/client/src/components/app/Button.svelte
index a10b992561..018f21c583 100644
--- a/packages/client/src/components/app/Button.svelte
+++ b/packages/client/src/components/app/Button.svelte
@@ -4,7 +4,6 @@
 
   const { styleable, builderStore } = getContext("sdk")
   const component = getContext("component")
-  const containerClickableStore = getContext("containerClickable")
 
   export let disabled = false
   export let text = ""
@@ -19,10 +18,6 @@
 
   let node
 
-  containerClickableStore.subscribe(hasOnClick => {
-    disabled = hasOnClick
-  })
-
   $: $component.editing && node?.focus()
   $: componentText = getComponentText(text, $builderStore, $component)
 
diff --git a/packages/client/src/components/app/Container.svelte b/packages/client/src/components/app/Container.svelte
index e8e757bc3e..a5c8ce6d4d 100644
--- a/packages/client/src/components/app/Container.svelte
+++ b/packages/client/src/components/app/Container.svelte
@@ -1,13 +1,9 @@
 <script>
-  import { getContext, setContext } from "svelte"
-  import { writable } from "svelte/store"
+  import { getContext } from "svelte"
 
   const { styleable } = getContext("sdk")
   const component = getContext("component")
 
-  const containerClickableStore = writable(false)
-  setContext("containerClickable", containerClickableStore)
-
   export let direction
   export let hAlign
   export let vAlign
@@ -28,7 +24,6 @@
     sizeClass,
     gapClass,
   ].join(" ")
-  $: containerClickableStore.set(!!onClick)
 </script>
 
 <div
diff --git a/packages/client/src/utils/buttonActions.js b/packages/client/src/utils/buttonActions.js
index 0f1f719181..c6f46d1c67 100644
--- a/packages/client/src/utils/buttonActions.js
+++ b/packages/client/src/utils/buttonActions.js
@@ -333,10 +333,6 @@ const confirmTextMap = {
  * A handler returning `false` is a flag to stop execution of handlers
  */
 export const enrichButtonActions = (actions, context) => {
-  if (actions && actions.length === 0) {
-    return null
-  }
-
   // Prevent button actions in the builder preview
   if (!actions || get(builderStore).inBuilder) {
     return () => {}