diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ExecuteQuery.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ExecuteQuery.svelte
index 042a55d761..6b9efa76d3 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ExecuteQuery.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ExecuteQuery.svelte
@@ -3,7 +3,7 @@
   import { datasources, integrations, queries } from "stores/backend"
   import BindingBuilder from "components/integration/QueryBindingBuilder.svelte"
   import IntegrationQueryEditor from "components/integration/index.svelte"
-  import { IntegrationTypes } from "constants/backend"
+  import { BUDIBASE_DATASOURCE_ID } from "constants/backend"
 
   export let parameters
   export let bindings = []
@@ -12,11 +12,9 @@
   $: datasource = $datasources.list.find(
     ds => ds._id === parameters.datasourceId
   )
-  // Executequery action just works on PostgreSQL and MongoDB datasources
+  // Executequery must exclude budibase datasource
   $: executeQueryDatasources = $datasources.list.filter(
-    x =>
-      x.source === IntegrationTypes.POSTGRES ||
-      x.source === IntegrationTypes.MONGODB
+    x => x._id !== BUDIBASE_DATASOURCE_ID
   )
 
   function fetchQueryDefinition(query) {
diff --git a/packages/builder/src/constants/backend/index.js b/packages/builder/src/constants/backend/index.js
index d8d09d592f..28ce35d9f7 100644
--- a/packages/builder/src/constants/backend/index.js
+++ b/packages/builder/src/constants/backend/index.js
@@ -163,6 +163,8 @@ export const SWITCHABLE_TYPES = [
   ...ALLOWABLE_NUMBER_TYPES,
 ]
 
+export const BUDIBASE_DATASOURCE_ID = "bb_internal"
+
 export const IntegrationTypes = {
   POSTGRES: "POSTGRES",
   MONGODB: "MONGODB",