diff --git a/frontend/src/components/app-config/user-config-form.tsx b/frontend/src/components/app-config/user-config-form.tsx
index 3a48b7ae2d3..6f3a33757f0 100644
--- a/frontend/src/components/app-config/user-config-form.tsx
+++ b/frontend/src/components/app-config/user-config-form.tsx
@@ -1361,7 +1361,7 @@ export const UserConfigForm: React.FC = () => {
             />
             <FormField
               control={form.control}
-              name="experimental.mcp_docs"
+              name="experimental.chat_modes"
               render={({ field }) => (
                 <div className="flex flex-col gap-y-1">
                   <FormItem className={formItemClasses}>
@@ -1376,7 +1376,7 @@ export const UserConfigForm: React.FC = () => {
                   </FormItem>
                   <IsOverridden
                     userConfig={config}
-                    name="experimental.mcp_docs"
+                    name="experimental.chat_modes"
                   />
                   <FormDescription>
                     Switch between different modes in the Chat sidebar, to
diff --git a/frontend/src/components/chat/chat-panel.tsx b/frontend/src/components/chat/chat-panel.tsx
index a5106ed589e..3c380139be2 100644
--- a/frontend/src/components/chat/chat-panel.tsx
+++ b/frontend/src/components/chat/chat-panel.tsx
@@ -369,7 +369,7 @@ const ChatInputFooter: React.FC<ChatInputFooterProps> = memo(
       <TooltipProvider>
         <div className="px-3 py-2 border-t border-border/20 flex flex-row items-center justify-between">
           <div className="flex items-center gap-2">
-            <FeatureFlagged feature="mcp_docs">
+            <FeatureFlagged feature="chat_modes">
               <Select value={currentMode} onValueChange={saveModeChange}>
                 <SelectTrigger className="h-6 text-xs border-border shadow-none! ring-0! bg-muted hover:bg-muted/30 py-0 px-2 gap-1 capitalize">
                   {currentMode}
diff --git a/frontend/src/core/config/feature-flag.tsx b/frontend/src/core/config/feature-flag.tsx
index 2979fcabb11..adb669be43f 100644
--- a/frontend/src/core/config/feature-flag.tsx
+++ b/frontend/src/core/config/feature-flag.tsx
@@ -12,6 +12,7 @@ export interface ExperimentalFeatures {
   rtc_v2: boolean;
   performant_table_charts: boolean;
   mcp_docs: boolean;
+  chat_modes: boolean;
   sql_linter: boolean;
   external_agents: boolean;
   sql_mode: boolean;
@@ -25,6 +26,7 @@ const defaultValues: ExperimentalFeatures = {
   rtc_v2: false,
   performant_table_charts: false,
   mcp_docs: false,
+  chat_modes: false,
   sql_linter: true,
   external_agents: import.meta.env.DEV,
   sql_mode: false,
diff --git a/marimo/_config/config.py b/marimo/_config/config.py
index 1cc5e1b9491..a6996688261 100644
--- a/marimo/_config/config.py
+++ b/marimo/_config/config.py
@@ -509,6 +509,7 @@ class ExperimentalConfig(TypedDict, total=False):
     rtc_v2: bool
     performant_table_charts: bool
     mcp_docs: bool
+    chat_modes: bool
     sql_linter: bool
     sql_mode: bool
 
diff --git a/pyproject.toml b/pyproject.toml
index f6e8b842081..4e65916c798 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -548,6 +548,7 @@ multi_column = true
 performant_table_charts = true
 sql_linter = true
 sql_mode = true
+chat_modes = true
 
 [tool.marimo.display]
 dataframes = "rich"