diff --git a/cli/src/transport.ts b/cli/src/transport.ts
index e693f246..22dde73b 100644
--- a/cli/src/transport.ts
+++ b/cli/src/transport.ts
@@ -38,8 +38,8 @@ function createStdioTransport(options: TransportOptions): Transport {
   const defaultEnv = getDefaultEnvironment();
 
   const env: Record<string, string> = {
-    ...processEnv,
     ...defaultEnv,
+    ...processEnv,
   };
 
   const { cmd: actualCommand, args: actualArgs } = findActualExecutable(
diff --git a/server/src/index.ts b/server/src/index.ts
index c967b60c..c113d1ea 100644
--- a/server/src/index.ts
+++ b/server/src/index.ts
@@ -60,7 +60,7 @@ const createTransport = async (req: express.Request): Promise<Transport> => {
     const command = query.command as string;
     const origArgs = shellParseArgs(query.args as string) as string[];
     const queryEnv = query.env ? JSON.parse(query.env as string) : {};
-    const env = { ...process.env, ...defaultEnvironment, ...queryEnv };
+    const env = { ...defaultEnvironment, ...process.env, ...queryEnv };
 
     const { cmd, args } = findActualExecutable(command, origArgs);