diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9742150a3..7ab7d57a1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -35,6 +35,7 @@ Status: unreleased.
 - macOS: keep custom SSH usernames in remote target. (#2046) Thanks @algal.
 
 ### Fixes
+- Gateway: add error handling for Tailscale cleanup in shutdown sequence to prevent interruption.
 - Web UI: improve WebChat image paste previews and allow image-only sends. (#1925) Thanks @smartprogrammer93.
 
 ## 2026.1.24-3
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 {