diff --git a/extensions/mermaid-chat-features/package.json b/extensions/mermaid-chat-features/package.json
index 436a4cc1fb3..30c57f90548 100644
--- a/extensions/mermaid-chat-features/package.json
+++ b/extensions/mermaid-chat-features/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "marmaid-chat-features",
+  "name": "mermaid-chat-features",
   "displayName": "%displayName%",
   "description": "%description%",
   "version": "1.0.0",
@@ -26,6 +26,20 @@
   "browser": "./dist/browser/extension",
   "activationEvents": [],
   "contributes": {
+    "configuration": {
+      "title": "Mermaid Chat Features",
+      "properties": {
+        "mermaid-chat.enabled": {
+          "type": "boolean",
+          "default": false,
+          "description": "%config.enabled.description%",
+          "scope": "application",
+          "tags": [
+            "experimental"
+          ]
+        }
+      }
+    },
     "chatOutputRenderers": [
       {
         "viewType": "vscode.chatMermaidDiagram",
@@ -42,6 +56,7 @@
         "canBeReferencedInPrompt": true,
         "modelDescription": "Renders a Mermaid diagram from Mermaid.js markup.",
         "userDescription": "Render a Mermaid.js diagrams from markup.",
+        "when": "config.mermaid-chat.enabled",
         "inputSchema": {
           "type": "object",
           "properties": {
diff --git a/extensions/mermaid-chat-features/package.nls.json b/extensions/mermaid-chat-features/package.nls.json
index 882e5d59f01..d2fe3d44c30 100644
--- a/extensions/mermaid-chat-features/package.nls.json
+++ b/extensions/mermaid-chat-features/package.nls.json
@@ -1,4 +1,5 @@
 {
 	"displayName": "Mermaid Chat Features",
-	"description": "Adds Mermaid diagram support to built-in chats."
+	"description": "Adds Mermaid diagram support to built-in chats.",
+	"config.enabled.description": "Enable a tool for experimental Mermaid diagram rendering in chat responses."
 }