diff --git a/crates/notebook/tests/live_share.rs b/crates/notebook/tests/live_share.rs
index 95eadeb8882740a24e87d901e0aa8e0c7178738f..c6aafd8b8c63884b7677c7bab214dbbb5ca283b2 100644
--- a/crates/notebook/tests/live_share.rs
+++ b/crates/notebook/tests/live_share.rs
@@ -133,7 +133,9 @@ fn two_guests_on_one_page_conflict_as_on_a_share() {
         texts.contains(&"Grace's text".to_owned()) && texts.contains(&"Alan's text".to_owned()),
         "{texts:?}"
     );
-    assert!(!alans.conflicts().unwrap().is_empty() || !graces.conflicts().unwrap().is_empty());
+    until("the host's conflict never reached a guest", || {
+        !alans.conflicts().unwrap().is_empty() || !graces.conflicts().unwrap().is_empty()
+    });
     drop(host);
 }