diff --git a/src/renderer/src/config/prompts.ts b/src/renderer/src/config/prompts.ts
index 281ef01f1b..05856be29d 100644
--- a/src/renderer/src/config/prompts.ts
+++ b/src/renderer/src/config/prompts.ts
@@ -48,4 +48,4 @@ export const SUMMARIZE_PROMPT =
   '你是一名擅长会话的助理，你需要将用户的会话总结为 10 个字以内的标题，不要使用标点符号和其他特殊符号。'
 
 export const TRANSLATE_PROMPT =
-  'Translate from input language to {{target_language}}, provide the translation result directly without any explanation, keep original format. If the target language is the same as the source language, do not translate. The text to be translated is as follows:\n\n{{text}}'
+  'You are a translation expert. Translate from input language to {{target_language}}, provide the translation result directly without any explanation and keep original format. Do not translate if the target language is the same as the source language.'
diff --git a/src/renderer/src/pages/home/Inputbar/Inputbar.tsx b/src/renderer/src/pages/home/Inputbar/Inputbar.tsx
index 44db8982b4..1cdc392916 100644
--- a/src/renderer/src/pages/home/Inputbar/Inputbar.tsx
+++ b/src/renderer/src/pages/home/Inputbar/Inputbar.tsx
@@ -130,7 +130,8 @@ const Inputbar: FC<Props> = ({ assistant, setActiveTopic }) => {
 
     try {
       setIsTranslating(true)
-      setText(await translateText(text, 'english'))
+      const translatedText = await translateText(text, 'english')
+      translatedText && setText(translatedText)
       setTimeout(() => resizeTextArea(), 0)
     } catch (error) {
       console.error('Translation failed:', error)
diff --git a/src/renderer/src/pages/settings/ModalSettings/ModelSettings.tsx b/src/renderer/src/pages/settings/ModalSettings/ModelSettings.tsx
index 8826887049..e197f9e3f6 100644
--- a/src/renderer/src/pages/settings/ModalSettings/ModelSettings.tsx
+++ b/src/renderer/src/pages/settings/ModalSettings/ModelSettings.tsx
@@ -90,6 +90,7 @@ const ModelSettings: FC = () => {
             style={{ width: 360 }}
             onChange={(value) => setDefaultModel(find(allModels, JSON.parse(value)) as Model)}
             options={selectOptions}
+            showSearch
             placeholder={t('settings.models.empty')}
           />
           <Button icon={<SettingOutlined />} style={{ marginLeft: 8 }} onClick={() => AssistantSettingsPopup.show()} />
@@ -110,6 +111,7 @@ const ModelSettings: FC = () => {
             style={{ width: 360 }}
             onChange={(value) => setTopicNamingModel(find(allModels, JSON.parse(value)) as Model)}
             options={selectOptions}
+            showSearch
             placeholder={t('settings.models.empty')}
           />
           <Button icon={<SettingOutlined />} style={{ marginLeft: 8 }} onClick={TopicNamingModalPopup.show} />
@@ -130,6 +132,7 @@ const ModelSettings: FC = () => {
             style={{ width: 360 }}
             onChange={(value) => setTranslateModel(find(allModels, JSON.parse(value)) as Model)}
             options={selectOptions}
+            showSearch
             placeholder={t('settings.models.empty')}
           />
           <Button icon={<SettingOutlined />} style={{ marginLeft: 8 }} onClick={onUpdateTranslateModel} />
diff --git a/src/renderer/src/services/MessagesService.ts b/src/renderer/src/services/MessagesService.ts
index 1ea0078e10..7136e1cab9 100644
--- a/src/renderer/src/services/MessagesService.ts
+++ b/src/renderer/src/services/MessagesService.ts
@@ -69,11 +69,13 @@ export async function locateToMessage(navigate: NavigateFunction, message: Messa
 export function getUserMessage({
   assistant,
   topic,
-  type
+  type,
+  content
 }: {
   assistant: Assistant
   topic: Topic
   type: Message['type']
+  content?: string
 }): Message {
   const defaultModel = getDefaultModel()
   const model = assistant.model || defaultModel
@@ -81,7 +83,7 @@ export function getUserMessage({
   return {
     id: uuid(),
     role: 'user',
-    content: '',
+    content: content || '',
     assistantId: assistant.id,
     topicId: topic.id,
     modelId: model.id,
diff --git a/src/renderer/src/services/TranslateService.ts b/src/renderer/src/services/TranslateService.ts
index 7bf94d76e1..bda31b688a 100644
--- a/src/renderer/src/services/TranslateService.ts
+++ b/src/renderer/src/services/TranslateService.ts
@@ -21,10 +21,17 @@ export const translateText = async (text: string, targetLanguage: string) => {
   const message = getUserMessage({
     assistant,
     topic: getDefaultTopic('default'),
-    type: 'text'
+    type: 'text',
+    content: text
   })
 
   const translatedText = await fetchTranslate({ message, assistant })
 
-  return translatedText
+  const trimmedText = translatedText.trim()
+
+  if (!trimmedText) {
+    return Promise.reject(new Error(i18n.t('translate.error.failed')))
+  }
+
+  return trimmedText
 }
diff --git a/src/renderer/src/store/index.ts b/src/renderer/src/store/index.ts
index 07a7afe6c7..0ae184dfca 100644
--- a/src/renderer/src/store/index.ts
+++ b/src/renderer/src/store/index.ts
@@ -26,7 +26,7 @@ const persistedReducer = persistReducer(
   {
     key: 'cherry-studio',
     storage,
-    version: 45,
+    version: 46,
     blacklist: ['runtime'],
     migrate
   },
diff --git a/src/renderer/src/store/migrate.ts b/src/renderer/src/store/migrate.ts
index 72dd97c0c5..0f0e9bf18a 100644
--- a/src/renderer/src/store/migrate.ts
+++ b/src/renderer/src/store/migrate.ts
@@ -708,6 +708,16 @@ const migrateConfig = {
   '45': (state: RootState) => {
     state.settings.enableTopicNaming = true
     return state
+  },
+  '46': (state: RootState) => {
+    if (
+      state.settings.translateModelPrompt.includes(
+        'If the target language is the same as the source language, do not translate'
+      )
+    ) {
+      state.settings.translateModelPrompt = TRANSLATE_PROMPT
+    }
+    return state
   }
 }