diff --git a/CHANGELOG.md b/CHANGELOG.md
index 37ae5fdf2..17700887d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -81,6 +81,7 @@ Status: beta.
 - macOS: auto-scroll to bottom when sending a new message while scrolled up. (#2471) Thanks @kennyklee.
 - Web UI: auto-expand the chat compose textarea while typing (with sensible max height). (#2950) Thanks @shivamraut101.
 - Gateway: prevent crashes on transient network errors (fetch failures, timeouts, DNS). Added fatal error detection to only exit on truly critical errors. Fixes #2895, #2879, #2873. (#2980) Thanks @elliotsecops.
+- Gateway: add error handling for Tailscale cleanup in shutdown sequence to prevent interruption.
 - Agents: guard channel tool listActions to avoid plugin crashes. (#2859) Thanks @mbelinky.
 - Discord: stop resolveDiscordTarget from passing directory params into messaging target parsers. Fixes #3167. Thanks @thewilloftheshadow.
 - Discord: avoid resolving bare channel names to user DMs when a username matches. Thanks @thewilloftheshadow.
diff --git a/src/gateway/server-close.ts b/src/gateway/server-close.ts
index da9f5a39e..e6d7d5baf 100644
--- a/src/gateway/server-close.ts
+++ b/src/gateway/server-close.ts
@@ -45,7 +45,11 @@ export function createGatewayCloseHandler(params: {
       }
     }
     if (params.tailscaleCleanup) {
-      await params.tailscaleCleanup();
+      try {
+        await params.tailscaleCleanup();
+      } catch {
+        /* ignore */
+      }
     }
     if (params.canvasHost) {
       try {