diff --git a/src/renderer/src/hooks/agents/useSession.ts b/src/renderer/src/hooks/agents/useSession.ts
index 6aae891908..3c5e849659 100644
--- a/src/renderer/src/hooks/agents/useSession.ts
+++ b/src/renderer/src/hooks/agents/useSession.ts
@@ -48,17 +48,20 @@ export const useSession = (agentId: string, sessionId: string) => {
         updated_at: ''
       } satisfies AgentSessionMessageEntity
       try {
-        mutate((prev) => ({
-          ...prev,
-          accessible_paths: prev?.accessible_paths ?? [],
-          model: prev?.model ?? '',
-          id: prev?.id ?? '',
-          agent_id: prev?.id ?? '',
-          agent_type: prev?.agent_type ?? 'claude-code',
-          created_at: prev?.created_at ?? '',
-          updated_at: prev?.updated_at ?? '',
-          messages: [...(prev?.messages ?? []), newMessageDraft]
-        }))
+        mutate(
+          (prev) => ({
+            ...prev,
+            accessible_paths: prev?.accessible_paths ?? [],
+            model: prev?.model ?? '',
+            id: prev?.id ?? '',
+            agent_id: prev?.id ?? '',
+            agent_type: prev?.agent_type ?? 'claude-code',
+            created_at: prev?.created_at ?? '',
+            updated_at: prev?.updated_at ?? '',
+            messages: [...(prev?.messages ?? []), newMessageDraft]
+          }),
+          false
+        )
         await client.createMessage(agentId, sessionId, content)
       } catch (error) {
         mutate(origin)
diff --git a/src/renderer/src/pages/home/Messages/AgentSessionMessages.tsx b/src/renderer/src/pages/home/Messages/AgentSessionMessages.tsx
index 4215af8c74..717cfb3d4e 100644
--- a/src/renderer/src/pages/home/Messages/AgentSessionMessages.tsx
+++ b/src/renderer/src/pages/home/Messages/AgentSessionMessages.tsx
@@ -37,7 +37,7 @@ const AgentSessionMessages: React.FC<Props> = ({ agentId, sessionId }) => {
       <NarrowLayout style={{ display: 'flex', flexDirection: 'column-reverse' }}>
         <ContextMenu>
           <ScrollContainer>
-            {messages.map((message) => {
+            {messages.toReversed().map((message) => {
               const content = getTextFromContent(message.content)
               return <div key={message.id}>{content}</div>
             })}