diff --git a/crates/assistant2/src/assistant2.rs b/crates/assistant2/src/assistant2.rs
index 3c68199dfa..cc083593d0 100644
--- a/crates/assistant2/src/assistant2.rs
+++ b/crates/assistant2/src/assistant2.rs
@@ -226,6 +226,8 @@ impl AssistantChat {
         }
 
         let context_id = self.next_context_id.post_inc();
+
+        self.user_message(submitted_id).contexts.clear();
         self.user_message(submitted_id)
             .contexts
             .push(AssistantContext::codebase(context_id));