diff --git a/.agents/skills/lib.sh b/.agents/skills/lib.sh
index fd1c472..359cfc3 100644
--- a/.agents/skills/lib.sh
+++ b/.agents/skills/lib.sh
@@ -740,7 +740,7 @@ except Exception:
 
       if [ -n "$idle_pane" ]; then
         target_pane="$idle_pane"
-        if [ -n "$final_cmd" ]; then
+        if [ -n "$env_flags" ] && [ -n "$final_cmd" ]; then
           idle_env="${env_flags//--env /}"
           idle_env="${idle_env:+$idle_env }HERDR_WORKSPACE_ID=$existing_ws"
           final_cmd="env $idle_env $final_cmd"