diff --git a/openapi/src/com/intellij/openapi/vcs/AbstractVcs.java b/openapi/src/com/intellij/openapi/vcs/AbstractVcs.java
index d90df4fa83f1..e599fd444369 100644
--- a/openapi/src/com/intellij/openapi/vcs/AbstractVcs.java
+++ b/openapi/src/com/intellij/openapi/vcs/AbstractVcs.java
@@ -89,6 +89,10 @@ public abstract class AbstractVcs {
   public void shutdown() throws VcsException {
     LOG.assertTrue(myIsStarted);
     myIsStarted = false;
+    final FileStatusProvider fileStatusProvider = getFileStatusProvider();
+    if (fileStatusProvider instanceof DelayedFileStatusProvider) {
+      ((DelayedFileStatusProvider)fileStatusProvider).dispose();
+    }
   }
 
   public FileViewEnvironment getFileViewEnvironment() {