diff --git a/llama_stack/providers/inline/agents/meta_reference/agent_instance.py b/llama_stack/providers/inline/agents/meta_reference/agent_instance.py
index 2b3d0dbc4..0c15b1b5e 100644
--- a/llama_stack/providers/inline/agents/meta_reference/agent_instance.py
+++ b/llama_stack/providers/inline/agents/meta_reference/agent_instance.py
@@ -156,7 +156,7 @@ class ChatAgent(ShieldRunnerMixin):
         turns = await self.storage.get_session_turns(request.session_id)
 
         messages = []
-        if len(turns) == 0 and self.agent_config.instructions != "":
+        if self.agent_config.instructions != "":
             messages.append(SystemMessage(content=self.agent_config.instructions))
 
         for i, turn in enumerate(turns):
diff --git a/llama_stack/providers/inline/agents/meta_reference/persistence.py b/llama_stack/providers/inline/agents/meta_reference/persistence.py
index 37ac75d6a..2565f1994 100644
--- a/llama_stack/providers/inline/agents/meta_reference/persistence.py
+++ b/llama_stack/providers/inline/agents/meta_reference/persistence.py
@@ -80,5 +80,5 @@ class AgentPersistence:
             except Exception as e:
                 print(f"Error parsing turn: {e}")
                 continue
-
+        turns.sort(key=lambda x: (x.completed_at or datetime.min))
         return turns