diff --git a/crates/agent_servers/src/claude.rs b/crates/agent_servers/src/claude.rs
index 9c712fb25ca9fc73f968c92142e62681e05ba53b..28b7c844c3797d799add40163fd034dd4fb335a7 100644
--- a/crates/agent_servers/src/claude.rs
+++ b/crates/agent_servers/src/claude.rs
@@ -82,11 +82,13 @@ impl AgentServer for ClaudeCode {
             settings.get::<AllAgentServersSettings>(None).claude.clone()
         });
 
-        dbg!(&root_dir);
-
         // Get the project environment variables for the root directory
         let project_env = delegate.project().update(cx, |project, cx| {
-            project.directory_environment(root_dir.as_path().into(), cx)
+            if let Some(path) = project.active_project_directory(cx) {
+                Some(project.directory_environment(path, cx))
+            } else {
+                None
+            }
         });
 
         cx.spawn(async move |cx| {
@@ -107,7 +109,9 @@ impl AgentServer for ClaudeCode {
             };
 
             // Merge project environment variables (from .env files, etc.)
-            if let Some(env) = dbg!(project_env.await) {
+            if let Some(project_env) = project_env
+                && let Some(env) = dbg!(project_env.await)
+            {
                 if let Some(command_env) = &mut command.env {
                     command_env.extend(
                         env.iter()