diff --git a/src/server.ts b/src/server.ts
index 608498a45..2a7e6cdea 100644
--- a/src/server.ts
+++ b/src/server.ts
@@ -926,6 +926,8 @@ export function createServer(
     const requestId = res.locals.requestId as string | undefined;
 
     await new Promise<void>((resolve, reject) => {
+      res.once("finish", resolve);
+      res.once("close", resolve);
       bearerAuth(req, res, (error?: unknown) => {
         if (error) reject(error);
         else resolve();