diff --git a/packages/core/src/config/config.ts b/packages/core/src/config/config.ts
index 159052dddf..6c1c539f4e 100644
--- a/packages/core/src/config/config.ts
+++ b/packages/core/src/config/config.ts
@@ -2302,7 +2302,10 @@ export class Config implements McpContext, AgentLoopContext {
   }
 
   getExperimentalUseAgentProtocol(): boolean {
-    return this.useAgentProtocol;
+    return (
+      this.useAgentProtocol ||
+      process.env['GEMINI_CLI_USE_AGENT_PROTOCOL'] === 'true'
+    );
   }
 
   isTopicUpdateNarrationEnabled(): boolean {