diff --git a/crates/assistant2/src/context.rs b/crates/assistant2/src/context.rs
index b83e3bad12cad8fc940627a9bb5f50139861bf03..7e335f41379dc11a345d02ffb8b2cff946f0b7d0 100644
--- a/crates/assistant2/src/context.rs
+++ b/crates/assistant2/src/context.rs
@@ -73,5 +73,7 @@ pub fn attach_context_to_message(
         context_text.push_str(&thread_context);
     }
 
-    message.content.push(MessageContent::Text(context_text));
+    if !context_text.is_empty() {
+        message.content.push(MessageContent::Text(context_text));
+    }
 }