diff --git a/.env.example b/.env.example
index e4e9713b442d..725a5775a4d9 100644
--- a/.env.example
+++ b/.env.example
@@ -103,7 +103,7 @@ LANGFLOW_STORE_ENVIRONMENT_VARIABLES=
 
 # Should enable the MCP composer feature in MCP projects
 # Values: true, false
-# Default: true
+# Default: false
 LANGFLOW_FEATURE_MCP_COMPOSER=
 
 # 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 d543df5a17f8..12e7c0276c1c 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 @@
 
 class FeatureFlags(BaseSettings):
     mvp_components: bool = False
-    mcp_composer: bool = True
+    mcp_composer: bool = False
 
     class Config:
         env_prefix = "LANGFLOW_FEATURE_"
diff --git a/src/frontend/src/modals/IOModal/components/chatView/components/chat-view.tsx b/src/frontend/src/modals/IOModal/components/chatView/components/chat-view.tsx
index 0d901cf352d1..655a6ca6274d 100644
--- a/src/frontend/src/modals/IOModal/components/chatView/components/chat-view.tsx
+++ b/src/frontend/src/modals/IOModal/components/chatView/components/chat-view.tsx
@@ -8,6 +8,7 @@ import LangflowLogo from "@/assets/LangflowLogo.svg?react";
 import { TextEffectPerChar } from "@/components/ui/textAnimation";
 import CustomChatInput from "@/customization/components/custom-chat-input";
 import { ENABLE_IMAGE_ON_PLAYGROUND } from "@/customization/feature-flags";
+import useCustomUseFileHandler from "@/customization/hooks/use-custom-use-file-handler";
 import { track } from "@/customization/utils/analytics";
 import { useMessagesStore } from "@/stores/messagesStore";
 import { useUtilityStore } from "@/stores/utilityStore";
@@ -20,7 +21,6 @@ import type { ChatMessageType } from "../../../../../types/chat";
 import type { chatViewProps } from "../../../../../types/components";
 import FlowRunningSqueleton from "../../flow-running-squeleton";
 import useDragAndDrop from "../chatInput/hooks/use-drag-and-drop";
-import { useFileHandler } from "../chatInput/hooks/use-file-handler";
 import ChatMessage from "../chatMessage/chat-message";
 import { ChatScrollAnchor } from "./chat-scroll-anchor";
 
@@ -141,7 +141,7 @@ export default function ChatView({
       });
   }
 
-  const { files, setFiles, handleFiles } = useFileHandler(realFlowId);
+  const { files, setFiles, handleFiles } = useCustomUseFileHandler(realFlowId);
   const [isDragging, setIsDragging] = useState(false);
 
   const { dragOver, dragEnter, dragLeave } = useDragAndDrop(
diff --git a/src/frontend/vite.config.mts b/src/frontend/vite.config.mts
index 19804b02ca94..662a3270bec9 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 ?? "true",
+        envLangflow.LANGFLOW_FEATURE_MCP_COMPOSER ?? "false",
       ),
     },
     plugins: [react(), svgr(), tsconfigPaths()],