From 82c923e03c29a0bc1c6180f7dc213cceffc24e88 Mon Sep 17 00:00:00 2001
From: Konstantin Wohlwend <n2d4xc@gmail.com>
Date: Sat, 18 Apr 2026 22:28:02 -0700
Subject: [PATCH] waitUntil Sentry flush is complete

---
 apps/backend/src/polyfills.tsx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/backend/src/polyfills.tsx b/apps/backend/src/polyfills.tsx
index d03b08e73..9215616b3 100644
--- a/apps/backend/src/polyfills.tsx
+++ b/apps/backend/src/polyfills.tsx
@@ -2,6 +2,7 @@ import * as Sentry from "@sentry/nextjs";
 import { getEnvVariable, getNodeEnvironment } from "@stackframe/stack-shared/dist/utils/env";
 import { captureError, registerErrorSink } from "@stackframe/stack-shared/dist/utils/errors";
 import * as util from "util";
+import { runAsynchronouslyAndWaitUntil } from "./utils/background-tasks";
 
 function expandStackPortPrefix(value?: string | null) {
   if (!value) return value ?? undefined;
@@ -11,10 +12,12 @@ function expandStackPortPrefix(value?: string | null) {
 
 const sentryErrorSink = (location: string, error: unknown) => {
   if (!("captureException" in Sentry)) {
-    // this happens if somehow this is called outside of a Next.js script (eg. in the Prisma seed.ts), just ignore
+    // this happens if somehow this is called outside of a Next.js script (eg. in the Prisma seed.ts), just log and ignore
+    console.log("Attempted to capture Sentry error outside of Next.js script, ignoring");
     return;
   }
   Sentry.captureException(error, { extra: { location } });
+  runAsynchronouslyAndWaitUntil(Sentry.flush());
 };
 
 export function ensurePolyfilled() {