diff --git a/packages/backend/src/server/api/StreamingApiServerService.ts b/packages/backend/src/server/api/StreamingApiServerService.ts
index 780f7a7e9e..42c0ef58f2 100644
--- a/packages/backend/src/server/api/StreamingApiServerService.ts
+++ b/packages/backend/src/server/api/StreamingApiServerService.ts
@@ -322,11 +322,13 @@ export class StreamingApiServerService implements OnApplicationShutdown {
 
 		await new Promise<void>((resolve, reject) => {
 			this.#wss.close(err => {
-				this.#wss.off('error', this.onWsError);
 				if (err) reject(err);
 				else resolve();
 			});
 		});
+
+		// Don't disconnect this until *after* close returns
+		this.#wss.off('error', this.onWsError);
 	}
 
 	@bindThis