diff --git a/packages/server/src/client/daemon-client-v2.ts b/packages/server/src/client/daemon-client-v2.ts
index b0f933965..02143a33f 100644
--- a/packages/server/src/client/daemon-client-v2.ts
+++ b/packages/server/src/client/daemon-client-v2.ts
@@ -2175,12 +2175,15 @@ export class DaemonClientV2 {
       }
     }
 
+    // Capture stack trace at call site, not inside setTimeout
+    const timeoutError = new Error(`Timeout waiting for message (${timeout}ms)`);
+
     return new Promise((resolve, reject) => {
       const timeoutHandle =
         timeout > 0
           ? setTimeout(() => {
               this.waiters.delete(waiter);
-              reject(new Error(`Timeout waiting for message (${timeout}ms)`));
+              reject(timeoutError);
             }, timeout)
           : null;