diff --git a/src/renderer/src/pages/home/Messages/Message.tsx b/src/renderer/src/pages/home/Messages/Message.tsx
index cc279f58..0647814b 100644
--- a/src/renderer/src/pages/home/Messages/Message.tsx
+++ b/src/renderer/src/pages/home/Messages/Message.tsx
@@ -74,7 +74,7 @@ const MessageItem: FC<Props> = ({ message, index, lastMessage, showMenu = true,
         <MessageContent message={message} model={model} />
         {!lastMessage && showMenu && (
           <MessageFooter style={{ border: messageBorder, flexDirection: isLastMessage ? 'row-reverse' : undefined }}>
-            <MessgeTokens message={message} />
+            <MessgeTokens message={message} isLastMessage={isLastMessage} />
             <MessageMenubar
               message={message}
               model={model}
diff --git a/src/renderer/src/pages/home/Messages/MessageTokens.tsx b/src/renderer/src/pages/home/Messages/MessageTokens.tsx
index 263e97a7..f893233d 100644
--- a/src/renderer/src/pages/home/Messages/MessageTokens.tsx
+++ b/src/renderer/src/pages/home/Messages/MessageTokens.tsx
@@ -3,7 +3,7 @@ import { EVENT_NAMES, EventEmitter } from '@renderer/services/event'
 import { Message } from '@renderer/types'
 import styled from 'styled-components'
 
-const MessgeTokens: React.FC<{ message: Message }> = ({ message }) => {
+const MessgeTokens: React.FC<{ message: Message; isLastMessage: boolean }> = ({ message, isLastMessage }) => {
   const { generating } = useRuntime()
 
   const locateMessage = () => {
@@ -18,7 +18,7 @@ const MessgeTokens: React.FC<{ message: Message }> = ({ message }) => {
     return <MessageMetadata onClick={locateMessage}>Tokens: {message?.usage?.total_tokens}</MessageMetadata>
   }
 
-  if (generating) {
+  if (isLastMessage && generating) {
     return null
   }