diff --git a/turbopack/crates/turbopack-cli/benches/small_apps.rs b/turbopack/crates/turbopack-cli/benches/small_apps.rs
index c6f1a4c85cc8e..d9ed3e8c52fd3 100644
--- a/turbopack/crates/turbopack-cli/benches/small_apps.rs
+++ b/turbopack/crates/turbopack-cli/benches/small_apps.rs
@@ -29,7 +29,7 @@ fn list_apps() -> (PathBuf, Vec<PathBuf>) {
         let path = entry.path();
         if path.is_dir() {
             // Exclude node_modules
-            if path.file_name().unwrap().to_string_lossy() == "node_modules" {
+            if path.file_name().unwrap_or_default() == "node_modules" {
                 continue;
             }
 
@@ -68,7 +68,6 @@ fn bench_small_apps(c: &mut Criterion) {
                     let app_name = app.file_name().unwrap().to_string_lossy().to_string();
 
                     rt.block_on(async move {
-                        //
                         turbopack_cli::build::build(&BuildArguments {
                             common: CommonArguments {
                                 entries: Some(vec![format!("{app_name}/index.tsx")]),
diff --git a/turbopack/crates/turbopack-cli/src/build/mod.rs b/turbopack/crates/turbopack-cli/src/build/mod.rs
index bf30ef769adda..005d00f979c13 100644
--- a/turbopack/crates/turbopack-cli/src/build/mod.rs
+++ b/turbopack/crates/turbopack-cli/src/build/mod.rs
@@ -199,7 +199,7 @@ async fn build_internal(
     target: Target,
 ) -> Result<Vc<()>> {
     let output_fs = output_fs(project_dir.clone());
-    let project_fs = project_fs(root_dir.clone());
+    let project_fs = project_fs(root_dir.clone(), /* watch= */ false);
     let project_relative = project_dir.strip_prefix(&*root_dir).unwrap();
     let project_relative: RcStr = project_relative
         .strip_prefix(MAIN_SEPARATOR)
diff --git a/turbopack/crates/turbopack-cli/src/dev/mod.rs b/turbopack/crates/turbopack-cli/src/dev/mod.rs
index 6c1e754e64513..41b5301a3135d 100644
--- a/turbopack/crates/turbopack-cli/src/dev/mod.rs
+++ b/turbopack/crates/turbopack-cli/src/dev/mod.rs
@@ -264,7 +264,7 @@ async fn source(
         .into();
 
     let output_fs = output_fs(project_dir);
-    let fs: Vc<Box<dyn FileSystem>> = project_fs(root_dir);
+    let fs: Vc<Box<dyn FileSystem>> = project_fs(root_dir, /* watch= */ true);
     let root_path = fs.root().to_resolved().await?;
     let project_path = root_path.join(project_relative).to_resolved().await?;
 
diff --git a/turbopack/crates/turbopack-cli/src/util.rs b/turbopack/crates/turbopack-cli/src/util.rs
index e572fbabdabaa..eeca44e5f4e02 100644
--- a/turbopack/crates/turbopack-cli/src/util.rs
+++ b/turbopack/crates/turbopack-cli/src/util.rs
@@ -60,9 +60,9 @@ pub fn normalize_entries(entries: &Option<Vec<String>>) -> Vec<RcStr> {
 }
 
 #[turbo_tasks::function]
-pub async fn project_fs(project_dir: RcStr) -> Result<Vc<Box<dyn FileSystem>>> {
+pub async fn project_fs(project_dir: RcStr, watch: bool) -> Result<Vc<Box<dyn FileSystem>>> {
     let disk_fs = DiskFileSystem::new("project".into(), project_dir, vec![]);
-    if cfg!(not(codspeed)) {
+    if watch {
         disk_fs.await?.start_watching(None).await?;
     }
     Ok(Vc::upcast(disk_fs))