diff --git a/codex-rs/core/src/codex.rs b/codex-rs/core/src/codex.rs
index 7d6493b4f5..faab4a8c2b 100644
--- a/codex-rs/core/src/codex.rs
+++ b/codex-rs/core/src/codex.rs
@@ -2709,7 +2709,9 @@ mod handlers {
         let force_inject_collaboration_instructions = {
             let mut state = sess.state.lock().await;
             let force = state.force_inject_collaboration_instructions;
-            state.force_inject_collaboration_instructions = false;
+            if next_collaboration_mode.is_some() {
+                state.force_inject_collaboration_instructions = false;
+            }
             force
         };
         let update_items = sess.build_settings_update_items(