diff --git a/src/agent/agent.rs b/src/agent/agent.rs
index 0d798091b..0dc282950 100644
--- a/src/agent/agent.rs
+++ b/src/agent/agent.rs
@@ -571,6 +571,16 @@ impl Agent {
                 )));
         }
 
+        let context = self
+            .memory_loader
+            .load_context(
+                self.memory.as_ref(),
+                user_message,
+                self.memory_session_id.as_deref(),
+            )
+            .await
+            .unwrap_or_default();
+
         if self.auto_save {
             let _ = self
                 .memory
@@ -583,16 +593,6 @@ impl Agent {
                 .await;
         }
 
-        let context = self
-            .memory_loader
-            .load_context(
-                self.memory.as_ref(),
-                user_message,
-                self.memory_session_id.as_deref(),
-            )
-            .await
-            .unwrap_or_default();
-
         let now = chrono::Local::now().format("%Y-%m-%d %H:%M:%S %Z");
         let enriched = if context.is_empty() {
             format!("[{now}] {user_message}")