diff --git a/src/server/eventBus.ts b/src/server/eventBus.ts
index 9f40aade4..899eb5299 100644
--- a/src/server/eventBus.ts
+++ b/src/server/eventBus.ts
@@ -74,7 +74,7 @@ export class EventBus {
           const sid = dataObj?.session_id ?? dataObj?.sessionID
           if (typeof sid === 'string') {
             const sessionCwd = this.sessionCwds.get(sid)
-            if (sessionCwd && sessionCwd !== client.cwdFilter) {
+            if (sessionCwd !== client.cwdFilter) {
               continue
             }
           }
diff --git a/src/server/sessionManager.ts b/src/server/sessionManager.ts
index 78f01d562..7e930d730 100644
--- a/src/server/sessionManager.ts
+++ b/src/server/sessionManager.ts
@@ -237,9 +237,8 @@ export class SessionManager {
 
     this.sessions.set(sessionId, handle)
     if (!opts.silent) {
-      void canonicalizePath(cwd).then(canonical => {
-        this.eventBus.registerSessionCwd(sessionId, canonical)
-      })
+      const canonical = await canonicalizePath(cwd).catch(() => cwd)
+      this.eventBus.registerSessionCwd(sessionId, canonical)
       this.eventBus.publishSessionEvent(sessionId, 'created', {
         status: 'starting',
         created_at: Date.now(),