diff --git a/apps/sim/tools/index.ts b/apps/sim/tools/index.ts
index 4d1a8a277..1dfe1faf2 100644
--- a/apps/sim/tools/index.ts
+++ b/apps/sim/tools/index.ts
@@ -933,8 +933,8 @@ async function executeMcpTool(
       )
     }
 
-    const workspaceId = params._context?.workspaceId
-    const workflowId = params._context?.workflowId
+    const workspaceId = params._context?.workspaceId || executionContext?.workspaceId
+    const workflowId = params._context?.workflowId || executionContext?.workflowId
 
     if (!workspaceId) {
       return {