diff --git a/apps/server/src/telemetry/Layers/AnalyticsService.ts b/apps/server/src/telemetry/Layers/AnalyticsService.ts
index 9881e910d9ceb4fcd76860385ea2e7936fb0197f..96339606e5c1853101b2955dd5e837f1dc2f5471 100644
--- a/apps/server/src/telemetry/Layers/AnalyticsService.ts
+++ b/apps/server/src/telemetry/Layers/AnalyticsService.ts
@@ -134,7 +134,7 @@ const makeAnalyticsService = Effect.gen(function* () {
 
   yield* Effect.forever(Effect.sleep(1000).pipe(Effect.flatMap(() => flush)), {
     disableYield: true,
-  }).pipe(Effect.forkDetach);
+  }).pipe(Effect.forkScoped);
 
   yield* Effect.addFinalizer(() => flush);