diff --git a/apps/server/src/api/server.ts b/apps/server/src/api/server.ts
index 00ab2f5f..ff8b4462 100644
--- a/apps/server/src/api/server.ts
+++ b/apps/server/src/api/server.ts
@@ -35,7 +35,7 @@ import {
 import type { Env, HttpServerConfig } from './types'
 import { defaultCorsConfig } from './utils/cors'
 
-async function assertPortAvailable(port: number): Promise<void> {
+async function assertPortAvailable(port: number, host: string): Promise<void> {
   const net = await import('node:net')
   return new Promise((resolve, reject) => {
     const probe = net.createServer()
@@ -52,7 +52,7 @@ async function assertPortAvailable(port: number): Promise<void> {
       }
     })
 
-    probe.listen({ port, host: '127.0.0.1', exclusive: true }, () => {
+    probe.listen({ port, host, exclusive: true }, () => {
       probe.close(() => resolve())
     })
   })
@@ -61,7 +61,7 @@ async function assertPortAvailable(port: number): Promise<void> {
 export async function createHttpServer(config: HttpServerConfig) {
   const {
     port,
-    host = '0.0.0.0',
+    host = '127.0.0.1',
     browserosId,
     executionDir,
     resourcesDir,
@@ -183,7 +183,7 @@ export async function createHttpServer(config: HttpServerConfig) {
     )
   })
 
-  await assertPortAvailable(port)
+  await assertPortAvailable(port, host)
 
   const server = Bun.serve({
     fetch: (request, server) => app.fetch(request, { server }),
diff --git a/apps/server/src/main.ts b/apps/server/src/main.ts
index 41a42b78..e6a0fa3f 100644
--- a/apps/server/src/main.ts
+++ b/apps/server/src/main.ts
@@ -86,7 +86,7 @@ export class Application {
     try {
       await createHttpServer({
         port: this.config.serverPort,
-        host: '0.0.0.0',
+        host: this.config.mcpAllowRemote ? '0.0.0.0' : '127.0.0.1',
         version: VERSION,
         browser,
         controller,