diff --git a/src/renderer/src/config/models.ts b/src/renderer/src/config/models.ts
index 5324f7004e..2c251ea217 100644
--- a/src/renderer/src/config/models.ts
+++ b/src/renderer/src/config/models.ts
@@ -2385,8 +2385,11 @@ export function isGenerateImageModel(model: Model): boolean {
 
   const modelId = getLowerBaseModelName(model.id, '/')
 
-  if (provider && provider.type === 'openai-response') {
-    return OPENAI_IMAGE_GENERATION_MODELS.some((imageModel) => modelId.includes(imageModel))
+  if (provider.type === 'openai-response') {
+    return (
+      OPENAI_IMAGE_GENERATION_MODELS.some((imageModel) => modelId.includes(imageModel)) ||
+      GENERATE_IMAGE_MODELS.some((imageModel) => modelId.includes(imageModel))
+    )
   }
 
   return GENERATE_IMAGE_MODELS.some((imageModel) => modelId.includes(imageModel))
diff --git a/src/renderer/src/pages/home/Inputbar/Inputbar.tsx b/src/renderer/src/pages/home/Inputbar/Inputbar.tsx
index db787c40fd..4012b2a9c9 100644
--- a/src/renderer/src/pages/home/Inputbar/Inputbar.tsx
+++ b/src/renderer/src/pages/home/Inputbar/Inputbar.tsx
@@ -780,12 +780,13 @@ const Inputbar: FC<Props> = ({ assistant: _assistant, setActiveTopic, topic }) =
     ) {
       updateAssistant({ ...assistant, webSearchProviderId: undefined })
     }
-    if (!isGenerateImageModel(model) && assistant.enableGenerateImage) {
+    if (isGenerateImageModel(model)) {
+      if (isAutoEnableImageGenerationModel(model) && !assistant.enableGenerateImage) {
+        updateAssistant({ ...assistant, enableGenerateImage: true })
+      }
+    } else if (assistant.enableGenerateImage) {
       updateAssistant({ ...assistant, enableGenerateImage: false })
     }
-    if (isAutoEnableImageGenerationModel(model) && !assistant.enableGenerateImage) {
-      updateAssistant({ ...assistant, enableGenerateImage: true })
-    }
   }, [assistant, model, updateAssistant])
 
   const onMentionModel = useCallback(