diff --git a/packages/cli/src/generated/commands/daemon.ts b/packages/cli/src/generated/commands/daemon.ts
index 70f8388f0..dd6ec373c 100644
--- a/packages/cli/src/generated/commands/daemon.ts
+++ b/packages/cli/src/generated/commands/daemon.ts
@@ -664,7 +664,7 @@ export async function stopDaemon(): Promise<void> {
   if (info) {
     for (let i = 0; i < 40; i += 1) {
       if (!isProcessAlive(info.pid)) break;
-      await new Promise<void>((r) => { const t = setTimeout(r, 50); if (typeof (t as any).unref === 'function') (t as any).unref(); });
+      await new Promise<void>((r) => { setTimeout(r, 50); });
     }
   }
 
diff --git a/packages/cli/src/kern/commands/daemon.kern b/packages/cli/src/kern/commands/daemon.kern
index 87b8d1480..9de224e06 100644
--- a/packages/cli/src/kern/commands/daemon.kern
+++ b/packages/cli/src/kern/commands/daemon.kern
@@ -639,7 +639,7 @@ fn name=stopDaemon returns="Promise<void>" async=true export=true
     if (info) {
       for (let i = 0; i < 40; i += 1) {
         if (!isProcessAlive(info.pid)) break;
-        await new Promise<void>((r) => { const t = setTimeout(r, 50); if (typeof (t as any).unref === 'function') (t as any).unref(); });
+        await new Promise<void>((r) => { setTimeout(r, 50); });
       }
     }
 
diff --git a/tests/integration/daemon-survival.test.ts b/tests/integration/daemon-survival.test.ts
index 661f75424..f0308035f 100644
--- a/tests/integration/daemon-survival.test.ts
+++ b/tests/integration/daemon-survival.test.ts
@@ -233,4 +233,28 @@ describeMaybe('agond survival — the daemon outlives its launcher', () => {
     const cleaned = await waitFor(() => !existsSync(sockPath) && !existsSync(pidPath), 4_000);
     expect(cleaned).toBe(true);
   }, 60_000);
+
+  it('daemon stop stays alive for its bounded poll and exits cleanly', async () => {
+    const env = { ...process.env, AGON_HOME: home, AGON_DAEMON_ECHO: '1', AGON_NO_STACK_TRACE_MAPPER: '1' };
+    const launcher = spawn(process.execPath, [CLI_ENTRY, 'daemon', 'start'], { env, stdio: 'ignore' });
+    expect(await waitFor(() => existsSync(pidPath) && existsSync(sockPath), 10_000)).toBe(true);
+    expect(await waitFor(() => launcher.exitCode !== null || launcher.killed, 10_000)).toBe(true);
+
+    const stopper = spawn(process.execPath, [CLI_ENTRY, 'daemon', 'stop'], { env, stdio: ['ignore', 'pipe', 'pipe'] });
+    let stdout = '';
+    let stderr = '';
+    stopper.stdout?.setEncoding('utf-8');
+    stopper.stderr?.setEncoding('utf-8');
+    stopper.stdout?.on('data', (chunk: string) => { stdout += chunk; });
+    stopper.stderr?.on('data', (chunk: string) => { stderr += chunk; });
+    const exitCode = await new Promise<number | null>((resolve, reject) => {
+      stopper.once('error', reject);
+      stopper.once('close', resolve);
+    });
+
+    expect(exitCode, stderr).toBe(0);
+    expect(stdout).toContain('agond stopped');
+    expect(stderr).not.toContain('unsettled top-level await');
+    expect(await waitFor(() => !existsSync(sockPath) && !existsSync(pidPath), 4_000)).toBe(true);
+  }, 30_000);
 });