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 dfe0991e2..dcc166820 100644
--- a/server-rs/crates/api-server/src/editor_agent/api.rs
+++ b/server-rs/crates/api-server/src/editor_agent/api.rs
@@ -269,15 +269,12 @@ fn build_tool_context(document: &EditorAgentConversationMessagesDocument) -> Edi
 
     for msg in document.messages.iter().rev() {
         if let Some(tc) = &msg.tool_call {
-            if !tc.images.is_empty() {
-                for img in &tc.images {
-                    let image_id = ImageId {
-                        id: img.object_key.clone().unwrap_or_default(),
-                    };
-                    let metadata = ImageMetadata { tag: String::new() };
-                    images.insert(image_id, metadata);
-                }
-                break;
+            for img in &tc.images {
+                let image_id = ImageId {
+                    id: img.object_key.clone().unwrap_or_default(),
+                };
+                let metadata = ImageMetadata { tag: String::new() };
+                images.insert(image_id, metadata);
             }
         }
         for a in &msg.attachments {