diff --git a/packages/client/src/utils/componentProps.js b/packages/client/src/utils/componentProps.js
index 65e86c28d6..5472c57308 100644
--- a/packages/client/src/utils/componentProps.js
+++ b/packages/client/src/utils/componentProps.js
@@ -43,5 +43,17 @@ export const enrichProps = (props, context) => {
     )
   }
 
+  // Enrich any click actions in conditions
+  if (enrichedProps._conditions) {
+    enrichedProps._conditions.forEach(condition => {
+      if (condition.setting === "onClick") {
+        condition.settingValue = enrichButtonActions(
+          condition.settingValue,
+          totalContext
+        )
+      }
+    })
+  }
+
   return enrichedProps
 }