diff --git a/server/claude-sdk.js b/server/claude-sdk.js
index 918a7bd6..919d8632 100644
--- a/server/claude-sdk.js
+++ b/server/claude-sdk.js
@@ -148,6 +148,10 @@ function mapCliOptionsToSDK(options = {}) {
 
   const sdkOptions = {};
 
+  if (process.env.CLAUDE_CLI_PATH) {
+    sdkOptions.pathToClaudeCodeExecutable = process.env.CLAUDE_CLI_PATH;
+  }
+
   // Map working directory
   if (cwd) {
     sdkOptions.cwd = cwd;