diff --git a/src/renderer/src/hooks/agents/useSession.ts b/src/renderer/src/hooks/agents/useSession.ts
index dff54430c1..558d7a75f1 100644
--- a/src/renderer/src/hooks/agents/useSession.ts
+++ b/src/renderer/src/hooks/agents/useSession.ts
@@ -31,7 +31,7 @@ export const useSession = (agentId: string, sessionId: string) => {
 
   return {
     session: data,
-    messages: data?.messages,
+    messages: data?.messages ?? [],
     error,
     isLoading,
     updateSession
diff --git a/src/renderer/src/types/agent.ts b/src/renderer/src/types/agent.ts
index 2db40b4582..5a86059eb5 100644
--- a/src/renderer/src/types/agent.ts
+++ b/src/renderer/src/types/agent.ts
@@ -194,7 +194,7 @@ export interface UpdateSessionRequest extends Partial<AgentBase> {}
 
 export const GetAgentSessionResponseSchema = AgentSessionEntitySchema.extend({
   built_in_tools: z.array(ToolSchema).optional(), // Built-in tools available to the agent
-  messages: z.array(AgentSessionMessageEntitySchema) // Messages in the session
+  messages: z.array(AgentSessionMessageEntitySchema).optional() // Messages in the session
 })
 
 export type GetAgentSessionResponse = z.infer<typeof GetAgentSessionResponseSchema>