diff --git a/GVFS/GVFS.Virtualization/FileSystemCallbacks.cs b/GVFS/GVFS.Virtualization/FileSystemCallbacks.cs
index 69973817a6..906bad018c 100644
--- a/GVFS/GVFS.Virtualization/FileSystemCallbacks.cs
+++ b/GVFS/GVFS.Virtualization/FileSystemCallbacks.cs
@@ -196,8 +196,11 @@ public void Stop()
                 this.postFetchJobThread?.Abort();
             }
 
-            this.fileSystemVirtualizer.PrepareToStop();
+            // Shutdown the GitStatusCache before other
+            // components that it depends on.
             this.gitStatusCache.Shutdown();
+
+            this.fileSystemVirtualizer.PrepareToStop();
             this.backgroundFileSystemTaskRunner.Shutdown();
             this.GitIndexProjection.Shutdown();
             this.BlobSizes.Shutdown();