diff --git a/tui_gateway/server.py b/tui_gateway/server.py
index d105250701d..41cbdd05e37 100644
--- a/tui_gateway/server.py
+++ b/tui_gateway/server.py
@@ -1378,7 +1378,7 @@ def _session_info(agent) -> dict:
         "fast": service_tier == "priority",
         "tools": {},
         "skills": {},
-        "cwd": os.getcwd(),
+        "cwd": os.getenv("TERMINAL_CWD", os.getcwd()),
         "version": "",
         "release_date": "",
         "update_behind": None,