diff --git a/app/mcp/client.ts b/app/mcp/client.ts
index b7b511a92..5c2f071e3 100644
--- a/app/mcp/client.ts
+++ b/app/mcp/client.ts
@@ -15,7 +15,14 @@ export async function createClient(
   const transport = new StdioClientTransport({
     command: config.command,
     args: config.args,
-    env: config.env,
+    env: {
+      ...Object.fromEntries(
+        Object.entries(process.env)
+          .filter(([_, v]) => v !== undefined)
+          .map(([k, v]) => [k, v as string]),
+      ),
+      ...(config.env || {}),
+    },
   });
 
   const client = new Client(