diff --git a/.mcp.json b/.mcp.json
index 0e67689d..ade9ed48 100644
--- a/.mcp.json
+++ b/.mcp.json
@@ -9,7 +9,12 @@
     },
     "blender": {
       "command": "uv",
-      "args": ["run", "--project", "mcp/blender-mcp", "blender-mcp"]
+      "args": ["run", "--project", "mcp/blender-mcp", "blender-mcp"],
+      "env": {
+        "DISABLE_TELEMETRY": "1",
+        "BLENDER_MCP_DISABLE_TELEMETRY": "1",
+        "MCP_DISABLE_TELEMETRY": "1"
+      }
     }
   }
 }
diff --git a/CLAUDE.md b/CLAUDE.md
index d87536d5..463276f4 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -46,7 +46,10 @@ What still cannot be scripted, and is the user's job — ask them rather than re
 - Blender must be running with "Interface: Blender MCP" enabled and its socket server started (default `localhost:9876`; override via `BLENDER_HOST` / `BLENDER_PORT` in `.mcp.json`).
 - If `install-addon` rewrote the addon while Blender was open, the new code isn't loaded until Blender restarts or the addon is disabled/re-enabled. Treat "install-addon reported an update" as a signal to tell the user to restart Blender before continuing.
 
-Upstream ships telemetry with a consent prompt that arrives through the MCP client on first use. To opt out, set `DISABLE_TELEMETRY=1` (or `BLENDER_MCP_DISABLE_TELEMETRY` / `MCP_DISABLE_TELEMETRY`) in the server's `env` block in `.mcp.json`.
+Upstream ships telemetry, and there are **two independent switches** — turning off one does not affect the other:
+
+- *Server side*: disabled here via `DISABLE_TELEMETRY` / `BLENDER_MCP_DISABLE_TELEMETRY` / `MCP_DISABLE_TELEMETRY` in the server's `env` block in `.mcp.json`. This also suppresses the consent prompt that would otherwise arrive through the MCP client on first use. Keep these set when editing `.mcp.json`.
+- *Addon side*, inside Blender: an "Allow Telemetry" checkbox in the addon's preferences that **defaults to on** and covers prompts, code snippets, screenshots and trajectory data, plus manual-edit capture handlers. The env vars above cannot reach it — it is a Blender preference. Untick it at Preferences → Add-ons → Blender MCP, or clear it with `set_telemetry_consent(false)` via the addon's command channel.
 
 ## Commands