diff --git a/packages/nx/src/daemon/server/project-graph-incremental-recomputation.ts b/packages/nx/src/daemon/server/project-graph-incremental-recomputation.ts
index 7e839e3c603d5..fc3abef69a438 100644
--- a/packages/nx/src/daemon/server/project-graph-incremental-recomputation.ts
+++ b/packages/nx/src/daemon/server/project-graph-incremental-recomputation.ts
@@ -236,7 +236,11 @@ async function processFilesAndCreateAndSerializeProjectGraph(
     performance.mark('hash-watched-changes-start');
     const updatedFiles = [...collectedUpdatedFiles.values()];
     const deletedFiles = [...collectedDeletedFiles.values()];
-    let updatedFileHashes = updateFilesInContext(updatedFiles, deletedFiles);
+    let updatedFileHashes = updateFilesInContext(
+      workspaceRoot,
+      updatedFiles,
+      deletedFiles
+    );
     performance.mark('hash-watched-changes-end');
     performance.measure(
       'hash changed files from watcher',
diff --git a/packages/nx/src/utils/sync-generators.ts b/packages/nx/src/utils/sync-generators.ts
index 867d8433b838b..e6598caeedf87 100644
--- a/packages/nx/src/utils/sync-generators.ts
+++ b/packages/nx/src/utils/sync-generators.ts
@@ -221,7 +221,12 @@ async function flushSyncGeneratorChangesToDisk(
   }
 
   // Update the context files
-  await updateContextWithChangedFiles(createdFiles, updatedFiles, deletedFiles);
+  await updateContextWithChangedFiles(
+    workspaceRoot,
+    createdFiles,
+    updatedFiles,
+    deletedFiles
+  );
   performance.mark('flush-sync-generator-changes-to-disk:end');
   performance.measure(
     'flush sync generator changes to disk',
diff --git a/packages/nx/src/utils/workspace-context.ts b/packages/nx/src/utils/workspace-context.ts
index 0866f3c0c1414..489dbb154c81c 100644
--- a/packages/nx/src/utils/workspace-context.ts
+++ b/packages/nx/src/utils/workspace-context.ts
@@ -75,12 +75,17 @@ export async function hashWithWorkspaceContext(
 }
 
 export async function updateContextWithChangedFiles(
+  workspaceRoot: string,
   createdFiles: string[],
   updatedFiles: string[],
   deletedFiles: string[]
 ) {
   if (!daemonClient.enabled()) {
-    updateFilesInContext([...createdFiles, ...updatedFiles], deletedFiles);
+    updateFilesInContext(
+      workspaceRoot,
+      [...createdFiles, ...updatedFiles],
+      deletedFiles
+    );
   } else if (isOnDaemon()) {
     // make sure to only import this when running on the daemon
     const { addUpdatedAndDeletedFiles } = await import(
@@ -99,9 +104,11 @@ export async function updateContextWithChangedFiles(
 }
 
 export function updateFilesInContext(
+  workspaceRoot: string,
   updatedFiles: string[],
   deletedFiles: string[]
 ) {
+  ensureContextAvailable(workspaceRoot);
   return workspaceContext?.incrementalUpdate(updatedFiles, deletedFiles);
 }