diff --git a/.env.example b/.env.example
index 9d9b283cdb..e4e9713b44 100644
--- a/.env.example
+++ b/.env.example
@@ -101,6 +101,11 @@ LANGFLOW_SUPERUSER_PASSWORD=
 # Values: true, false
 LANGFLOW_STORE_ENVIRONMENT_VARIABLES=
 
+# Should enable the MCP composer feature in MCP projects
+# Values: true, false
+# Default: true
+LANGFLOW_FEATURE_MCP_COMPOSER=
+
 # STORE_URL
 # Example: LANGFLOW_STORE_URL=https://api.langflow.store
 # LANGFLOW_STORE_URL=
diff --git a/src/backend/base/langflow/services/settings/feature_flags.py b/src/backend/base/langflow/services/settings/feature_flags.py
index 12e7c0276c..d543df5a17 100644
--- a/src/backend/base/langflow/services/settings/feature_flags.py
+++ b/src/backend/base/langflow/services/settings/feature_flags.py
@@ -3,7 +3,7 @@ from pydantic_settings import BaseSettings
 
 class FeatureFlags(BaseSettings):
     mvp_components: bool = False
-    mcp_composer: bool = False
+    mcp_composer: bool = True
 
     class Config:
         env_prefix = "LANGFLOW_FEATURE_"
diff --git a/src/frontend/vite.config.mts b/src/frontend/vite.config.mts
index 662a3270be..19804b02ca 100644
--- a/src/frontend/vite.config.mts
+++ b/src/frontend/vite.config.mts
@@ -54,7 +54,7 @@ export default defineConfig(({ mode }) => {
         envLangflow.LANGFLOW_AUTO_LOGIN ?? true,
       ),
       "process.env.LANGFLOW_FEATURE_MCP_COMPOSER": JSON.stringify(
-        envLangflow.LANGFLOW_FEATURE_MCP_COMPOSER ?? "false",
+        envLangflow.LANGFLOW_FEATURE_MCP_COMPOSER ?? "true",
       ),
     },
     plugins: [react(), svgr(), tsconfigPaths()],