diff --git a/content/en/docs/refguide/modeling/mendix-ai-assistance/maia-make/studio-pro-mcp-server.md b/content/en/docs/refguide/modeling/mendix-ai-assistance/maia-make/studio-pro-mcp-server.md
new file mode 100644
index 00000000000..0c35fd8250b
--- /dev/null
+++ b/content/en/docs/refguide/modeling/mendix-ai-assistance/maia-make/studio-pro-mcp-server.md
@@ -0,0 +1,41 @@
+---
+title: "Studio Pro MCP Server"
+linktitle: "MCP Server"
+url: /refguide/studio-pro-mcp-server/
+weight: 85
+description: "Describes the features in Studio Pro MCP Server."
+#If moving or renaming this doc file, implement a temporary redirect and let the respective team know they should update the URL in the product. See Mapping to Products for more details.
+---
+
+## Introduction
+
+{{% alert color="info" %}}
+This feature is available in Studio Pro 11.10 and above. 
+
+To use Studio Pro MCP Server, an internet connection and signing in to Studio Pro are required.
+{{% /alert %}}
+
+Studio Pro MCP Server enables you to leverage Maia's capabilities directly from external clients, including AI coding assistants, agents, and other MCP-based LLM tools.
+
+It has the following key highlights:
+
+* Full Maia feature parity — The MCP Server exposes the same capabilities that Maia offers within Studio Pro.
+* Live updates — Any changes made through Maia via the MCP Server are reflected in real time within Studio Pro.
+
+## Enabling the MCP Server
+
+To enable the MCP Server, navigate to **Preferences** > **Maia** > **MCP Server**, and check **Enable MCP Server**. You can also configure the port in this menu.
+
+### Connecting External Clients
+
+Once enabled, you can connect external clients to the MCP Server. For example, to add it to Claude Code, run the following command:
+    
+`claude mcp add <name> --transport http http://localhost:<port>/mcp`
+
+Replace `<name>` with your preferred server name and `<port>` with the port configured in **Preferences**.
+
+## Read More
+
+* [Maia Make Capabilities](/refguide/maia-make/)
+* [Mendix AI Assistance (Maia)](/refguide/mendix-ai-assistance/)
+* [Maia Chat](/refguide/maia-chat/)
diff --git a/content/en/docs/refguide/modeling/menus/edit-menu/preferences-dialog.md b/content/en/docs/refguide/modeling/menus/edit-menu/preferences-dialog.md
index 8378392a0e3..b35dfa6fd42 100644
--- a/content/en/docs/refguide/modeling/menus/edit-menu/preferences-dialog.md
+++ b/content/en/docs/refguide/modeling/menus/edit-menu/preferences-dialog.md
@@ -128,7 +128,7 @@ The **In-Editor Recommender** section contains the following settings:
 
 * **Enable for microflow, nanoflow, and rule editors** – this allows you to enable and disable [Logic Recommender](/refguide/logic-recommender/) in the microflow, nanoflow, and rule editors. It is enabled by default. 
 * **Enable for workflow editor** – this allows you to enable and disable [Workflow Recommender](/refguide/workflow-recommender/) in the workflow editor. It is enabled by default.
-* **Enable for page editor** - this allows you to enable and disable the [UI Recommendor](/refguide/ui-recommender/). It is enabled by default.
+* **Enable for page editor** - this allows you to enable and disable the [UI Recommender](/refguide/ui-recommender/). It is enabled by default.
 
 ### Best Practice Recommender
 
@@ -138,6 +138,12 @@ The **Best Practice Recommender** section contains the following settings:
 
 * **Automatically run an inspection after opening an app** – when enabled, [Best Practice Recommender](/refguide/best-practice-recommender/) automatically runs an inspection when an app is opened. If the app contains errors, the inspection will not run. It is enabled by default.
 
+### MCP Server
+
+* **Enable MCP Server** - When enabled, you can use the [Studio Pro MCP Server](/refguide/studio-pro-mcp-server/), which enables you to leverage Maia's capabilities directly from external clients, including AI coding assistants, agents, and other MCP-based LLM tools. It is disabled by default.
+
+    **Port** (Default: 7782) - With this setting, you can configure the port of the server. 
+
 ## Model Tab
 
 ### Pages