diff --git a/src/renderer/src/pages/home/Messages/Message.tsx b/src/renderer/src/pages/home/Messages/Message.tsx
index a5c18990..5be93e0f 100644
--- a/src/renderer/src/pages/home/Messages/Message.tsx
+++ b/src/renderer/src/pages/home/Messages/Message.tsx
@@ -5,6 +5,7 @@ import { useModel } from '@renderer/hooks/useModel'
 import { useMessageStyle, useSettings } from '@renderer/hooks/useSettings'
 import { fetchChatCompletion } from '@renderer/services/ApiService'
 import { EVENT_NAMES, EventEmitter } from '@renderer/services/EventService'
+import { getMessageModelId } from '@renderer/services/MessagesService'
 import { estimateMessageUsage } from '@renderer/services/TokenService'
 import { Message, Topic } from '@renderer/types'
 import { classNames, runAsyncFunction } from '@renderer/utils'
@@ -52,7 +53,7 @@ const MessageItem: FC<Props> = ({
   const [message, setMessage] = useState(_message)
   const { t } = useTranslation()
   const { assistant, setModel } = useAssistant(message.assistantId)
-  const model = useModel(message.modelId)
+  const model = useModel(getMessageModelId(message))
   const { isBubbleStyle } = useMessageStyle()
   const { showMessageDivider, messageFont, fontSize } = useSettings()
   const messageContainerRef = useRef<HTMLDivElement>(null)
@@ -165,7 +166,7 @@ const MessageItem: FC<Props> = ({
       })}
       ref={messageContainerRef}
       style={{ ...style, alignItems: isBubbleStyle ? (isAssistantMessage ? 'start' : 'end') : undefined }}>
-      <MessageHeader message={message} assistant={assistant} model={model} key={message.modelId} />
+      <MessageHeader message={message} assistant={assistant} model={model} key={getMessageModelId(message)} />
       <MessageContentContainer
         className="message-content-container"
         style={{ fontFamily, fontSize, background: messageBackground }}>
diff --git a/src/renderer/src/pages/home/Messages/MessageHeader.tsx b/src/renderer/src/pages/home/Messages/MessageHeader.tsx
index ae39249c..745cc74f 100644
--- a/src/renderer/src/pages/home/Messages/MessageHeader.tsx
+++ b/src/renderer/src/pages/home/Messages/MessageHeader.tsx
@@ -5,6 +5,7 @@ import { getModelLogo } from '@renderer/config/models'
 import { useTheme } from '@renderer/context/ThemeProvider'
 import useAvatar from '@renderer/hooks/useAvatar'
 import { useMessageStyle, useSettings } from '@renderer/hooks/useSettings'
+import { getMessageModelId } from '@renderer/services/MessagesService'
 import { Assistant, Message, Model } from '@renderer/types'
 import { firstLetter, removeLeadingEmoji } from '@renderer/utils'
 import { Avatar } from 'antd'
@@ -31,7 +32,7 @@ const MessageHeader: FC<Props> = memo(({ assistant, model, message }) => {
   const { t } = useTranslation()
   const { isBubbleStyle } = useMessageStyle()
 
-  const avatarSource = useMemo(() => getAvatarSource(isLocalAi, message.modelId), [message.modelId])
+  const avatarSource = useMemo(() => getAvatarSource(isLocalAi, getMessageModelId(message)), [message])
 
   const getUserName = useCallback(() => {
     if (isLocalAi && message.role !== 'user') return APP_NAME
diff --git a/src/renderer/src/pages/home/Messages/MessageMenubar.tsx b/src/renderer/src/pages/home/Messages/MessageMenubar.tsx
index 1c59103e..820adfd4 100644
--- a/src/renderer/src/pages/home/Messages/MessageMenubar.tsx
+++ b/src/renderer/src/pages/home/Messages/MessageMenubar.tsx
@@ -84,7 +84,7 @@ const MessageMenubar: FC<Props> = (props) => {
         ...nextMessage,
         content: '',
         status: 'sending',
-        modelId: assistantModel?.id || model?.id,
+        model: assistantModel || model,
         translatedContent: undefined
       })
     }
@@ -93,7 +93,7 @@ const MessageMenubar: FC<Props> = (props) => {
       EventEmitter.emit(EVENT_NAMES.SEND_MESSAGE, { ...message, id: uuid() })
       onDeleteMessage?.(message)
     }
-  }, [assistantModel?.id, message, model?.id, onDeleteMessage, onGetMessages])
+  }, [assistantModel, message, model, onDeleteMessage, onGetMessages])
 
   const onEdit = useCallback(async () => {
     let resendMessage = false
@@ -169,7 +169,7 @@ const MessageMenubar: FC<Props> = (props) => {
     [message, onEdit, onNewBranch, t]
   )
 
-  const onDeleteAndRegenerate = async () => {
+  const onRegenerate = async () => {
     await modelGenerating()
     const selectedModel = await SelectModelPopup.show({ model })
     if (!selectedModel) return
@@ -180,7 +180,6 @@ const MessageMenubar: FC<Props> = (props) => {
       reasoning_content: undefined,
       metrics: undefined,
       status: 'sending',
-      modelId: selectedModel.id,
       model: selectedModel,
       translatedContent: undefined,
       metadata: undefined
@@ -214,7 +213,7 @@ const MessageMenubar: FC<Props> = (props) => {
       </Tooltip>
       {isAssistantMessage && (
         <Tooltip title={t('common.regenerate')} mouseEnterDelay={0.8}>
-          <ActionButton className="message-action-button" onClick={onDeleteAndRegenerate}>
+          <ActionButton className="message-action-button" onClick={onRegenerate}>
             <SyncOutlined />
           </ActionButton>
         </Tooltip>
diff --git a/src/renderer/src/pages/home/Messages/Messages.tsx b/src/renderer/src/pages/home/Messages/Messages.tsx
index 1e3ca242..a50cf1e2 100644
--- a/src/renderer/src/pages/home/Messages/Messages.tsx
+++ b/src/renderer/src/pages/home/Messages/Messages.tsx
@@ -164,8 +164,7 @@ const Messages: FC<Props> = ({ assistant, topic, setActiveTopic }) => {
       }),
       EventEmitter.on(EVENT_NAMES.REGENERATE_MESSAGE, async (model: Model) => {
         const lastUserMessage = last(filterMessages(messages).filter((m) => m.role === 'user'))
-        lastUserMessage &&
-          onSendMessage({ ...lastUserMessage, id: uuid(), modelId: model.id, model: model, mentions: [model] })
+        lastUserMessage && onSendMessage({ ...lastUserMessage, id: uuid(), model: model, mentions: [model] })
       }),
       EventEmitter.on(EVENT_NAMES.AI_AUTO_RENAME, autoRenameTopic),
       EventEmitter.on(EVENT_NAMES.CLEAR_MESSAGES, () => {
diff --git a/src/renderer/src/pages/translate/TranslatePage.tsx b/src/renderer/src/pages/translate/TranslatePage.tsx
index 801e9957..e7e9be3b 100644
--- a/src/renderer/src/pages/translate/TranslatePage.tsx
+++ b/src/renderer/src/pages/translate/TranslatePage.tsx
@@ -55,7 +55,7 @@ const TranslatePage: FC = () => {
       content: text,
       assistantId: assistant.id,
       topicId: uuid(),
-      modelId: translateModel.id,
+      model: translateModel,
       createdAt: new Date().toISOString(),
       type: 'text',
       status: 'sending'
diff --git a/src/renderer/src/services/AssistantService.ts b/src/renderer/src/services/AssistantService.ts
index 64137d8e..af64ccd5 100644
--- a/src/renderer/src/services/AssistantService.ts
+++ b/src/renderer/src/services/AssistantService.ts
@@ -133,7 +133,7 @@ export async function addAssistantMessagesToTopic({ assistant, topic }: { assist
       topicId: topic.id,
       createdAt: new Date().toISOString(),
       status: 'success',
-      modelId: assistant.defaultModel?.id || defaultModel.id,
+      model: assistant.defaultModel || defaultModel,
       type: 'text',
       isPreset: true
     }
diff --git a/src/renderer/src/services/MessagesService.ts b/src/renderer/src/services/MessagesService.ts
index afaf0bfe..b27517a4 100644
--- a/src/renderer/src/services/MessagesService.ts
+++ b/src/renderer/src/services/MessagesService.ts
@@ -86,7 +86,7 @@ export function getUserMessage({
     content: content || '',
     assistantId: assistant.id,
     topicId: topic.id,
-    modelId: model.id,
+    model,
     createdAt: new Date().toISOString(),
     type,
     status: 'success'
@@ -104,7 +104,6 @@ export function getAssistantMessage({ assistant, topic }: { assistant: Assistant
     assistantId: assistant.id,
     topicId: topic.id,
     model,
-    modelId: model.id,
     createdAt: new Date().toISOString(),
     type: 'text',
     status: 'sending'
@@ -150,3 +149,7 @@ export function getGroupedMessages(messages: Message[]): { [key: string]: (Messa
   })
   return groups
 }
+
+export function getMessageModelId(message: Message) {
+  return message?.model?.id || message.modelId
+}
diff --git a/src/renderer/src/windows/mini/chat/components/Message.tsx b/src/renderer/src/windows/mini/chat/components/Message.tsx
index 3f419328..4ff4f16b 100644
--- a/src/renderer/src/windows/mini/chat/components/Message.tsx
+++ b/src/renderer/src/windows/mini/chat/components/Message.tsx
@@ -5,6 +5,7 @@ import MessageContent from '@renderer/pages/home/Messages/MessageContent'
 import MessageErrorBoundary from '@renderer/pages/home/Messages/MessageErrorBoundary'
 import { fetchChatCompletion } from '@renderer/services/ApiService'
 import { getDefaultAssistant, getDefaultModel } from '@renderer/services/AssistantService'
+import { getMessageModelId } from '@renderer/services/MessagesService'
 import { Message } from '@renderer/types'
 import { isMiniWindow } from '@renderer/utils'
 import { Dispatch, FC, memo, SetStateAction, useEffect, useMemo, useRef, useState } from 'react'
@@ -24,7 +25,7 @@ const getMessageBackground = (isBubbleStyle: boolean, isAssistantMessage: boolea
 
 const MessageItem: FC<Props> = ({ message: _message, index, total, route, onSetMessages, onGetMessages }) => {
   const [message, setMessage] = useState(_message)
-  const model = useModel(message.modelId)
+  const model = useModel(getMessageModelId(message))
   const isBubbleStyle = true
   const { messageFont, fontSize } = useSettings()
   const messageContainerRef = useRef<HTMLDivElement>(null)
diff --git a/src/renderer/src/windows/mini/translate/TranslateWindow.tsx b/src/renderer/src/windows/mini/translate/TranslateWindow.tsx
index 41d5527f..82547478 100644
--- a/src/renderer/src/windows/mini/translate/TranslateWindow.tsx
+++ b/src/renderer/src/windows/mini/translate/TranslateWindow.tsx
@@ -45,7 +45,7 @@ const Translate: FC<Props> = ({ text }) => {
         content: text,
         assistantId: assistant.id,
         topicId: uuid(),
-        modelId: translateModel.id,
+        model: translateModel,
         createdAt: new Date().toISOString(),
         type: 'text',
         status: 'sending'