diff --git a/crates/project/src/project.rs b/crates/project/src/project.rs
index e02b109b52a08f04335ea9eea84259e669c380f3..fa036c8419aea0206191025d5bc1445b5078db59 100644
--- a/crates/project/src/project.rs
+++ b/crates/project/src/project.rs
@@ -273,9 +273,11 @@ impl Project {
             }
             let mut watch = watch.unwrap();
             loop {
-                if let Some(Some(id)) = watch.recv().await {
+                let id = *watch.borrow();
+                if let Some(id) = id {
                     return id;
                 }
+                watch.recv().await;
             }
         }
     }