diff --git a/packages/components/nodes/agentflow/ExecuteFlow/ExecuteFlow.ts b/packages/components/nodes/agentflow/ExecuteFlow/ExecuteFlow.ts
index b1f62bb9..edc72053 100644
--- a/packages/components/nodes/agentflow/ExecuteFlow/ExecuteFlow.ts
+++ b/packages/components/nodes/agentflow/ExecuteFlow/ExecuteFlow.ts
@@ -181,7 +181,8 @@ class ExecuteFlow_Agentflow implements INode {
             if (selectedFlowId === options.chatflowid) throw new Error('Cannot call the same agentflow!')
 
             let headers: Record<string, string> = {
-                'Content-Type': 'application/json'
+                'Content-Type': 'application/json',
+                'flowise-tool': 'true'
             }
             if (chatflowApiKey) headers = { ...headers, Authorization: `Bearer ${chatflowApiKey}` }
 
diff --git a/packages/server/src/queue/PredictionQueue.ts b/packages/server/src/queue/PredictionQueue.ts
index af91d8fb..10cc125f 100644
--- a/packages/server/src/queue/PredictionQueue.ts
+++ b/packages/server/src/queue/PredictionQueue.ts
@@ -87,7 +87,9 @@ export class PredictionQueue extends BaseQueue {
             return await executeCustomNodeFunction({
                 appDataSource: this.appDataSource,
                 componentNodes: this.componentNodes,
-                data: executeCustomFunctionData.data
+                data: executeCustomFunctionData.data,
+                workspaceId: executeCustomFunctionData.workspaceId,
+                orgId: executeCustomFunctionData.orgId
             })
         }