diff --git a/packages/builder/src/builderStore/dataBinding.js b/packages/builder/src/builderStore/dataBinding.js
index bebd06c6d7..62b61eee7c 100644
--- a/packages/builder/src/builderStore/dataBinding.js
+++ b/packages/builder/src/builderStore/dataBinding.js
@@ -502,7 +502,7 @@ const getRoleBindings = () => {
 }
 
 /**
- * Gets all bindable properties exposed in a button actions flow up until
+ * Gets all bindable properties exposed in a button action flow up until
  * the specified action ID, as well as context provided for the action
  * setting as a whole by the component.
  */
@@ -520,10 +520,7 @@ export const getButtonContextBindings = (
   const component = findComponent(asset.props, componentId)
   const settings = getComponentSettings(component?._component)
   const eventSetting = settings.find(setting => setting.key === settingKey)
-  if (!eventSetting) {
-    return bindings
-  }
-  if (eventSetting.context?.length) {
+  if (eventSetting?.context?.length) {
     eventSetting.context.forEach(contextEntry => {
       bindings.push({
         readableBinding: contextEntry.label,