diff --git a/src/gateway/server.ts b/src/gateway/server.ts
index 8b53ae41e..be4466722 100644
--- a/src/gateway/server.ts
+++ b/src/gateway/server.ts
@@ -1101,15 +1101,14 @@ export async function startGatewayServer(
   }
 
   const tailnetDns = await resolveTailnetDnsHint();
+  const sshPortEnv = process.env.CLAWDBOT_SSH_PORT?.trim();
+  const sshPortParsed = sshPortEnv ? Number.parseInt(sshPortEnv, 10) : NaN;
+  const sshPort =
+    Number.isFinite(sshPortParsed) && sshPortParsed > 0
+      ? sshPortParsed
+      : undefined;
 
   try {
-    const sshPortEnv = process.env.CLAWDBOT_SSH_PORT?.trim();
-    const sshPortParsed = sshPortEnv ? Number.parseInt(sshPortEnv, 10) : NaN;
-    const sshPort =
-      Number.isFinite(sshPortParsed) && sshPortParsed > 0
-        ? sshPortParsed
-        : undefined;
-
     const bonjour = await startGatewayBonjourAdvertiser({
       instanceName: formatBonjourInstanceName(machineDisplayName),
       gatewayPort: port,
diff --git a/src/infra/bonjour-discovery.ts b/src/infra/bonjour-discovery.ts
index 6ec233872..c77178ac1 100644
--- a/src/infra/bonjour-discovery.ts
+++ b/src/infra/bonjour-discovery.ts
@@ -270,6 +270,7 @@ async function discoverWideAreaViaTailnetDns(
 
   if (!nameserver || ptrs.length === 0) return [];
   if (remainingMs() <= 0) return [];
+  const nameserverArg = `@${nameserver}`;
 
   const results: GatewayBonjourBeacon[] = [];
   for (const ptr of ptrs) {
@@ -285,7 +286,7 @@ async function discoverWideAreaViaTailnetDns(
         "+short",
         "+time=1",
         "+tries=1",
-        `@${nameserver}`,
+        nameserverArg,
         ptrName,
         "SRV",
       ],
@@ -312,7 +313,7 @@ async function discoverWideAreaViaTailnetDns(
         "+short",
         "+time=1",
         "+tries=1",
-        `@${nameserver}`,
+        nameserverArg,
         ptrName,
         "TXT",
       ],