diff --git a/bot_bottle/agent_provider.py b/bot_bottle/agent_provider.py
index 80f99d1..cd271dc 100644
--- a/bot_bottle/agent_provider.py
+++ b/bot_bottle/agent_provider.py
@@ -194,6 +194,8 @@ def agent_provision_plan(
                 "guest, but Codex did not accept it"
             )))
     if template == PROVIDER_CLAUDE:
+        env_vars["CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC"] = "1"
+        env_vars["DISABLE_ERROR_REPORTING"] = "1"
         egress_routes.append(EgressRoute(
             host="api.anthropic.com",
             auth_scheme="Bearer" if auth_token else "",
@@ -202,8 +204,6 @@ def agent_provision_plan(
         ))
         if auth_token:
             env_vars["CLAUDE_CODE_OAUTH_TOKEN"] = "egress-placeholder"
-            env_vars["CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC"] = "1"
-            env_vars["DISABLE_ERROR_REPORTING"] = "1"
             hidden_env_names = frozenset({"CLAUDE_CODE_OAUTH_TOKEN"})
 
     return AgentProvisionPlan(