diff --git a/components/canvas/CanvasChatPanel.tsx b/components/canvas/CanvasChatPanel.tsx
index a29cafdda..b3f6be7a0 100644
--- a/components/canvas/CanvasChatPanel.tsx
+++ b/components/canvas/CanvasChatPanel.tsx
@@ -9952,8 +9952,25 @@ export function CanvasChatPanel({
                 <Select
                   value={modelSelectValue}
                   onValueChange={(value) => {
+                    const nextModel = allModels.find((model) => model.id === value);
+                    const nextIsVideoModel = Boolean(
+                      nextModel && VIDEO_PROVIDER_TYPES.has(nextModel.providerType)
+                    );
+                    const nextIsConversationModel = Boolean(
+                      nextModel &&
+                        nextModel.id !== "auto" &&
+                        nextModel.isMultimodal &&
+                        !nextIsVideoModel
+                    );
                     currentModelIdRef.current = value;
                     setSelectedModelId(value);
+                    if (value === "auto" || nextIsConversationModel) {
+                      setComposerModeOverride("agent");
+                    } else if (nextIsVideoModel) {
+                      setComposerModeOverride("video");
+                    } else {
+                      setComposerModeOverride("image");
+                    }
                     if (value !== "auto" || !aiDetailGenerationEnabled) {
                       setIsDetailGenerationMode(false);
                     }