diff --git a/letta/agents/letta_agent.py b/letta/agents/letta_agent.py
index 55e5603d..0f74d44a 100644
--- a/letta/agents/letta_agent.py
+++ b/letta/agents/letta_agent.py
@@ -180,7 +180,7 @@ class LettaAgent(BaseAgent):
         # Extend the in context message ids
         if not agent_state.message_buffer_autoclear:
             message_ids = [m.id for m in (current_in_context_messages + new_in_context_messages)]
-            self.agent_manager.set_in_context_messages(agent_id=self.agent_id, message_ids=message_ids, actor=self.actor)
+            await self.agent_manager.set_in_context_messages_async(agent_id=self.agent_id, message_ids=message_ids, actor=self.actor)
 
         # Return back usage
         yield f"data: {usage.model_dump_json()}\n\n"
@@ -278,7 +278,7 @@ class LettaAgent(BaseAgent):
         # Extend the in context message ids
         if not agent_state.message_buffer_autoclear:
             message_ids = [m.id for m in (current_in_context_messages + new_in_context_messages)]
-            self.agent_manager.set_in_context_messages(agent_id=self.agent_id, message_ids=message_ids, actor=self.actor)
+            await self.agent_manager.set_in_context_messages_async(agent_id=self.agent_id, message_ids=message_ids, actor=self.actor)
 
         return current_in_context_messages, new_in_context_messages, usage
 
@@ -430,7 +430,7 @@ class LettaAgent(BaseAgent):
         # Extend the in context message ids
         if not agent_state.message_buffer_autoclear:
             message_ids = [m.id for m in (current_in_context_messages + new_in_context_messages)]
-            self.agent_manager.set_in_context_messages(agent_id=self.agent_id, message_ids=message_ids, actor=self.actor)
+            await self.agent_manager.set_in_context_messages_async(agent_id=self.agent_id, message_ids=message_ids, actor=self.actor)
 
         # TODO: This may be out of sync, if in between steps users add files
         # NOTE (cliandy): temporary for now for particlar use cases.