diff --git a/server-rs/crates/api-server/src/editor_agent/api.rs b/server-rs/crates/api-server/src/editor_agent/api.rs
index 3b1c69635..1a026cca7 100644
--- a/server-rs/crates/api-server/src/editor_agent/api.rs
+++ b/server-rs/crates/api-server/src/editor_agent/api.rs
@@ -135,6 +135,10 @@ pub async fn editor_agent_message(
             EditorAgentMessageRole::Assistant => LlmMessage::assistant(&msg.text),
             EditorAgentMessageRole::System => LlmMessage::system(&msg.text),
         })
+        // limit to last 18 messages (larger considering attachment, tool calls are injected as system messages)
+        .rev()
+        .take(18)
+        .rev()
         .collect();
 
     // Save user message to document.