diff --git a/letta/agents/base_agent.py b/letta/agents/base_agent.py
index d4e4e38f..9624fa49 100644
--- a/letta/agents/base_agent.py
+++ b/letta/agents/base_agent.py
@@ -117,7 +117,7 @@ class BaseAgent(ABC):
                 system_prompt=agent_state.system,
                 in_context_memory=agent_state.memory,
                 in_context_memory_last_edit=memory_edit_timestamp,
-                previous_message_count=num_messages,
+                previous_message_count=num_messages - len(in_context_messages),
                 archival_memory_size=num_archival_memories,
                 tool_rules_solver=tool_rules_solver,
             )
diff --git a/letta/services/agent_manager.py b/letta/services/agent_manager.py
index a100c5cd..dc292d1f 100644
--- a/letta/services/agent_manager.py
+++ b/letta/services/agent_manager.py
@@ -1419,7 +1419,7 @@ class AgentManager:
             system_prompt=agent_state.system,
             in_context_memory=agent_state.memory,
             in_context_memory_last_edit=memory_edit_timestamp,
-            previous_message_count=num_messages,
+            previous_message_count=num_messages - len(agent_state.message_ids),
             archival_memory_size=num_archival_memories,
         )
 
@@ -1493,7 +1493,7 @@ class AgentManager:
             system_prompt=agent_state.system,
             in_context_memory=agent_state.memory,
             in_context_memory_last_edit=memory_edit_timestamp,
-            previous_message_count=num_messages,
+            previous_message_count=num_messages - len(agent_state.message_ids),
             archival_memory_size=num_archival_memories,
             tool_rules_solver=tool_rules_solver,
         )