diff --git a/.vscode/launch.json b/.vscode/launch.json
index 3fd3b6a2..e2a769b3 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -22,6 +22,15 @@
       "jinja": true,
       "justMyCode": true,
       "cwd": "${workspaceFolder}"
+    },
+    {
+      "name": "Run `python server.py`",
+      "type": "debugpy",
+      "request": "launch",
+      "program": "server.py",
+      "console": "integratedTerminal",
+      "cwd": "/absolute/path/to/your/mcp_server",
+      "args": []
     }
   ]
 }
diff --git a/libs/arcade-mcp-server/arcade_mcp_server/context.py b/libs/arcade-mcp-server/arcade_mcp_server/context.py
index ba3b6fc3..a0f09da1 100644
--- a/libs/arcade-mcp-server/arcade_mcp_server/context.py
+++ b/libs/arcade-mcp-server/arcade_mcp_server/context.py
@@ -513,7 +513,7 @@ class Tools(_ContextComponent):
             definition=tool.definition,
             input_model=tool.input_model,
             output_model=tool.output_model,
-            context=tool_context,
+            context=self._ctx,
             **params,
         )
         return cast(ToolCallOutput, result)
diff --git a/libs/arcade-mcp-server/arcade_mcp_server/server.py b/libs/arcade-mcp-server/arcade_mcp_server/server.py
index 661bea1e..94ec47ad 100644
--- a/libs/arcade-mcp-server/arcade_mcp_server/server.py
+++ b/libs/arcade-mcp-server/arcade_mcp_server/server.py
@@ -664,7 +664,7 @@ class MCPServer:
                 definition=tool.definition,
                 input_model=tool.input_model,
                 output_model=tool.output_model,
-                context=tool_context,
+                context=mctx if mctx is not None else tool_context,
                 **input_params,
             )