diff --git a/src/Mcp/Controllers/McpApiController.php b/src/Mcp/Controllers/McpApiController.php
index 3cb9e7a..87b416e 100644
--- a/src/Mcp/Controllers/McpApiController.php
+++ b/src/Mcp/Controllers/McpApiController.php
@@ -222,10 +222,16 @@ class McpApiController extends Controller
             throw new \RuntimeException("Tool not found: {$tool}");
         }
 
+        $context = [];
+
+        if ($apiKey?->workspace_id) {
+            $context['workspace_id'] = $apiKey->workspace_id;
+        }
+
         return $registry->execute(
             name: $tool,
             args: $arguments,
-            context: [],
+            context: $context,
             apiKey: $apiKey,
             validateDependencies: false
         );