diff --git a/packages/client/src/utils/buttonActions.js b/packages/client/src/utils/buttonActions.js
index c4a3b36e73..178abd328d 100644
--- a/packages/client/src/utils/buttonActions.js
+++ b/packages/client/src/utils/buttonActions.js
@@ -51,7 +51,7 @@ const navigationHandler = action => {
 
 const queryExecutionHandler = async (action, context) => {
   const { datasourceId, queryId, queryParams } = action.parameters
-  const enrichedQueryParameters = enrichDataBindings(queryParams, context)
+  const enrichedQueryParameters = enrichDataBindings(queryParams || {}, context)
   await executeQuery({
     datasourceId,
     queryId,