diff --git a/src/server/project.ts b/src/server/project.ts
index 797ce3dd5d4..46b1416095f 100644
--- a/src/server/project.ts
+++ b/src/server/project.ts
@@ -2023,9 +2023,11 @@ export abstract class Project implements LanguageServiceHost, ModuleResolutionHo
         else {
             this.typeAcquisition = undefined;
         }
-        // If the typeAcquition is disabled, dont use typing files as root
+        // If the typeAcquition is disabled, dont use typing files as root and close existing watchers from TI
         if (!this.getTypeAcquisition().enable) {
+            const typingsCache = this.typingsCache;
             this.updateTypingFiles(/*setTypings*/ undefined, /*newTypings*/ undefined, /*scheduleUpdate*/ false);
+            if (typingsCache) this.projectService.typingsInstaller.onProjectClosed(this);
         }
     }
 
diff --git a/src/typingsInstallerCore/typingsInstaller.ts b/src/typingsInstallerCore/typingsInstaller.ts
index ce9c607b83c..f6fc608fd71 100644
--- a/src/typingsInstallerCore/typingsInstaller.ts
+++ b/src/typingsInstallerCore/typingsInstaller.ts
@@ -487,7 +487,7 @@ export abstract class TypingsInstaller {
 
         const existing = this.projectWatchers.get(projectName);
         const newSet = new Set(files);
-        if (!existing || forEachKey(newSet, s => !existing.has(s)) || forEachKey(existing, s => !newSet.has(s))) {
+        if (!existing || newSet.size !== existing.size || forEachKey(newSet, s => !existing.has(s)) || forEachKey(existing, s => !newSet.has(s))) {
             this.projectWatchers.set(projectName, newSet);
             this.sendResponse({ kind: ActionWatchTypingLocations, projectName, files });
         }
diff --git a/tests/baselines/reference/tsserver/typeAquisition/changes-to-typeAquisition-when-typing-installer-installs-typing-multiple-projects-with-shared-resolution.js b/tests/baselines/reference/tsserver/typeAquisition/changes-to-typeAquisition-when-typing-installer-installs-typing-multiple-projects-with-shared-resolution.js
index a70f5c55afd..a42991dd263 100644
--- a/tests/baselines/reference/tsserver/typeAquisition/changes-to-typeAquisition-when-typing-installer-installs-typing-multiple-projects-with-shared-resolution.js
+++ b/tests/baselines/reference/tsserver/typeAquisition/changes-to-typeAquisition-when-typing-installer-installs-typing-multiple-projects-with-shared-resolution.js
@@ -2102,6 +2102,18 @@ Info seq  [hh:mm:ss:mss] Config: /users/user/projects/project1/jsconfig.json : {
   "configFilePath": "/users/user/projects/project1/jsconfig.json"
  }
 }
+TI:: [hh:mm:ss:mss] Closing file watchers for project '/users/user/projects/project1/jsconfig.json'
+TI:: [hh:mm:ss:mss] Sending response:
+    {
+      "kind": "action::watchTypingLocations",
+      "projectName": "/users/user/projects/project1/jsconfig.json",
+      "files": []
+    }
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /users/user/projects/project1/bower_components 1 undefined Project: /users/user/projects/project1/jsconfig.json WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /users/user/projects/project1/bower_components 1 undefined Project: /users/user/projects/project1/jsconfig.json WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /users/user/projects/project1/node_modules 1 undefined Project: /users/user/projects/project1/jsconfig.json WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /users/user/projects/project1/node_modules 1 undefined Project: /users/user/projects/project1/jsconfig.json WatchType: Directory location for typing installer
+TI:: [hh:mm:ss:mss] Closing file watchers for project '/users/user/projects/project1/jsconfig.json' - done.
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /users/user/projects/project1/jsconfig.json
 Info seq  [hh:mm:ss:mss] File '/home/src/Library/Caches/typescript/node_modules/@types/package.json' does not exist according to earlier cached lookups.
 Info seq  [hh:mm:ss:mss] File '/home/src/Library/Caches/typescript/node_modules/package.json' does not exist according to earlier cached lookups.
@@ -2191,6 +2203,70 @@ Info seq  [hh:mm:ss:mss] event:
     }
 After running Timeout callback:: count: 0
 
+PolledWatches::
+/home/src/Library/Caches/typescript/node_modules/@types/bar/package.json:
+  {"pollingInterval":2000}
+/home/src/Library/Caches/typescript/node_modules/@types/foo/package.json:
+  {"pollingInterval":2000}
+/home/src/Library/Caches/typescript/node_modules/@types/package.json:
+  {"pollingInterval":2000}
+/home/src/Library/Caches/typescript/node_modules/package.json:
+  {"pollingInterval":2000}
+/users/user/projects/node_modules/@types:
+  {"pollingInterval":500}
+/users/user/projects/node_modules/bar/package.json:
+  {"pollingInterval":2000}
+/users/user/projects/node_modules/package.json:
+  {"pollingInterval":2000}
+/users/user/projects/package.json:
+  {"pollingInterval":2000}
+/users/user/projects/project1/node_modules:
+  {"pollingInterval":500}
+/users/user/projects/project1/node_modules/@types:
+  {"pollingInterval":500}
+/users/user/projects/project2/bower_components:
+  {"pollingInterval":500}
+/users/user/projects/project2/node_modules:
+  {"pollingInterval":500}
+/users/user/projects/project2/node_modules/@types:
+  {"pollingInterval":500}
+/users/user/projects/project3/node_modules:
+  {"pollingInterval":500}
+/users/user/projects/project3/node_modules/@types:
+  {"pollingInterval":500}
+
+PolledWatches *deleted*::
+/users/user/projects/project1/bower_components:
+  {"pollingInterval":500}
+
+FsWatches::
+/home/src/Library/Caches/typescript/package.json:
+  {}
+/home/src/tslibs/TS/Lib/lib.d.ts:
+  {}
+/users/user/projects/project1/jsconfig.json:
+  {}
+/users/user/projects/project2/app2.js:
+  {}
+/users/user/projects/project2/jsconfig.json:
+  {}
+/users/user/projects/project3/app2.js:
+  {}
+/users/user/projects/project3/jsconfig.json:
+  {}
+
+FsWatchesRecursive::
+/home/src/Library/Caches/typescript/node_modules:
+  {}
+/users/user/projects/node_modules:
+  {}
+/users/user/projects/project1:
+  {}
+/users/user/projects/project2:
+  {}
+/users/user/projects/project3:
+  {}
+
 Projects::
 /users/user/projects/project1/jsconfig.json (Configured) *changed*
     projectStateVersion: 4
diff --git a/tests/baselines/reference/tsserver/typeAquisition/changes-to-typeAquisition-when-typing-installer-installs-typing-multiple-projects.js b/tests/baselines/reference/tsserver/typeAquisition/changes-to-typeAquisition-when-typing-installer-installs-typing-multiple-projects.js
index 4fa125e47da..2c4ab1d4e1f 100644
--- a/tests/baselines/reference/tsserver/typeAquisition/changes-to-typeAquisition-when-typing-installer-installs-typing-multiple-projects.js
+++ b/tests/baselines/reference/tsserver/typeAquisition/changes-to-typeAquisition-when-typing-installer-installs-typing-multiple-projects.js
@@ -2180,6 +2180,18 @@ Info seq  [hh:mm:ss:mss] Config: /users/user/projects/project1/jsconfig.json : {
   "configFilePath": "/users/user/projects/project1/jsconfig.json"
  }
 }
+TI:: [hh:mm:ss:mss] Closing file watchers for project '/users/user/projects/project1/jsconfig.json'
+TI:: [hh:mm:ss:mss] Sending response:
+    {
+      "kind": "action::watchTypingLocations",
+      "projectName": "/users/user/projects/project1/jsconfig.json",
+      "files": []
+    }
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /users/user/projects/project1/bower_components 1 undefined Project: /users/user/projects/project1/jsconfig.json WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /users/user/projects/project1/bower_components 1 undefined Project: /users/user/projects/project1/jsconfig.json WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /users/user/projects/project1/node_modules 1 undefined Project: /users/user/projects/project1/jsconfig.json WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /users/user/projects/project1/node_modules 1 undefined Project: /users/user/projects/project1/jsconfig.json WatchType: Directory location for typing installer
+TI:: [hh:mm:ss:mss] Closing file watchers for project '/users/user/projects/project1/jsconfig.json' - done.
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /users/user/projects/project1/jsconfig.json
 Info seq  [hh:mm:ss:mss] File '/home/src/Library/Caches/typescript/node_modules/@types/package.json' does not exist according to earlier cached lookups.
 Info seq  [hh:mm:ss:mss] File '/home/src/Library/Caches/typescript/node_modules/package.json' does not exist according to earlier cached lookups.
@@ -2269,6 +2281,72 @@ Info seq  [hh:mm:ss:mss] event:
     }
 After running Timeout callback:: count: 0
 
+PolledWatches::
+/home/src/Library/Caches/typescript/node_modules/@types/bar/package.json:
+  {"pollingInterval":2000}
+/home/src/Library/Caches/typescript/node_modules/@types/foo/package.json:
+  {"pollingInterval":2000}
+/home/src/Library/Caches/typescript/node_modules/@types/package.json:
+  {"pollingInterval":2000}
+/home/src/Library/Caches/typescript/node_modules/package.json:
+  {"pollingInterval":2000}
+/users/user/projects/node_modules:
+  {"pollingInterval":500}
+/users/user/projects/node_modules/@types:
+  {"pollingInterval":500}
+/users/user/projects/package.json:
+  {"pollingInterval":2000}
+/users/user/projects/project1/node_modules/@types:
+  {"pollingInterval":500}
+/users/user/projects/project2/bower_components:
+  {"pollingInterval":500}
+/users/user/projects/project2/node_modules/@types:
+  {"pollingInterval":500}
+/users/user/projects/project3/node_modules/@types:
+  {"pollingInterval":500}
+/users/user/projects/project3/node_modules/bar/package.json:
+  {"pollingInterval":2000}
+/users/user/projects/project3/node_modules/package.json:
+  {"pollingInterval":2000}
+/users/user/projects/project3/package.json:
+  {"pollingInterval":2000}
+
+PolledWatches *deleted*::
+/users/user/projects/project1/bower_components:
+  {"pollingInterval":500}
+
+FsWatches::
+/home/src/Library/Caches/typescript/package.json:
+  {}
+/home/src/tslibs/TS/Lib/lib.d.ts:
+  {}
+/users/user/projects/project1/jsconfig.json:
+  {}
+/users/user/projects/project2/app2.js:
+  {}
+/users/user/projects/project2/jsconfig.json:
+  {}
+/users/user/projects/project3/app2.js:
+  {}
+/users/user/projects/project3/jsconfig.json:
+  {}
+
+FsWatchesRecursive::
+/home/src/Library/Caches/typescript/node_modules:
+  {}
+/users/user/projects/project1:
+  {}
+/users/user/projects/project1/node_modules:
+  {}
+/users/user/projects/project2:
+  {}
+/users/user/projects/project2/node_modules:
+  {}
+/users/user/projects/project3:
+  {}
+/users/user/projects/project3/node_modules:
+  {}
+
 Projects::
 /users/user/projects/project1/jsconfig.json (Configured) *changed*
     projectStateVersion: 4
diff --git a/tests/baselines/reference/tsserver/typeAquisition/changes-to-typeAquisition-when-typing-installer-installs-typing.js b/tests/baselines/reference/tsserver/typeAquisition/changes-to-typeAquisition-when-typing-installer-installs-typing.js
index 2cefac4713e..d923b57240b 100644
--- a/tests/baselines/reference/tsserver/typeAquisition/changes-to-typeAquisition-when-typing-installer-installs-typing.js
+++ b/tests/baselines/reference/tsserver/typeAquisition/changes-to-typeAquisition-when-typing-installer-installs-typing.js
@@ -890,6 +890,18 @@ Info seq  [hh:mm:ss:mss] Config: /users/user/projects/project1/jsconfig.json : {
   "configFilePath": "/users/user/projects/project1/jsconfig.json"
  }
 }
+TI:: [hh:mm:ss:mss] Closing file watchers for project '/users/user/projects/project1/jsconfig.json'
+TI:: [hh:mm:ss:mss] Sending response:
+    {
+      "kind": "action::watchTypingLocations",
+      "projectName": "/users/user/projects/project1/jsconfig.json",
+      "files": []
+    }
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /users/user/projects/project1/bower_components 1 undefined Project: /users/user/projects/project1/jsconfig.json WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /users/user/projects/project1/bower_components 1 undefined Project: /users/user/projects/project1/jsconfig.json WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /users/user/projects/project1/node_modules 1 undefined Project: /users/user/projects/project1/jsconfig.json WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /users/user/projects/project1/node_modules 1 undefined Project: /users/user/projects/project1/jsconfig.json WatchType: Directory location for typing installer
+TI:: [hh:mm:ss:mss] Closing file watchers for project '/users/user/projects/project1/jsconfig.json' - done.
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /users/user/projects/project1/jsconfig.json
 Info seq  [hh:mm:ss:mss] File '/home/src/Library/Caches/typescript/node_modules/@types/bar/package.json' does not exist according to earlier cached lookups.
 Info seq  [hh:mm:ss:mss] File '/home/src/Library/Caches/typescript/node_modules/@types/package.json' does not exist according to earlier cached lookups.
@@ -954,6 +966,40 @@ Info seq  [hh:mm:ss:mss] event:
     }
 After running Timeout callback:: count: 0
 
+PolledWatches::
+/home/src/Library/Caches/typescript/node_modules/@types/bar/package.json:
+  {"pollingInterval":2000}
+/home/src/Library/Caches/typescript/node_modules/@types/package.json:
+  {"pollingInterval":2000}
+/home/src/Library/Caches/typescript/node_modules/package.json:
+  {"pollingInterval":2000}
+/users/user/projects/node_modules:
+  {"pollingInterval":500}
+/users/user/projects/node_modules/@types:
+  {"pollingInterval":500}
+/users/user/projects/project1/node_modules/@types:
+  {"pollingInterval":500}
+
+PolledWatches *deleted*::
+/users/user/projects/project1/bower_components:
+  {"pollingInterval":500}
+
+FsWatches::
+/home/src/Library/Caches/typescript/package.json:
+  {}
+/home/src/tslibs/TS/Lib/lib.d.ts:
+  {}
+/users/user/projects/project1/jsconfig.json:
+  {}
+
+FsWatchesRecursive::
+/home/src/Library/Caches/typescript/node_modules:
+  {}
+/users/user/projects/project1:
+  {}
+/users/user/projects/project1/node_modules:
+  {}
+
 Projects::
 /users/user/projects/project1/jsconfig.json (Configured) *changed*
     projectStateVersion: 4
diff --git a/tests/baselines/reference/tsserver/typeAquisition/changes-to-typeAquisition-with-already-aquired-typing-multiple-projects-with-shared-resolution.js b/tests/baselines/reference/tsserver/typeAquisition/changes-to-typeAquisition-with-already-aquired-typing-multiple-projects-with-shared-resolution.js
index c41203f0abc..2536c5c65b3 100644
--- a/tests/baselines/reference/tsserver/typeAquisition/changes-to-typeAquisition-with-already-aquired-typing-multiple-projects-with-shared-resolution.js
+++ b/tests/baselines/reference/tsserver/typeAquisition/changes-to-typeAquisition-with-already-aquired-typing-multiple-projects-with-shared-resolution.js
@@ -1342,6 +1342,18 @@ Info seq  [hh:mm:ss:mss] Config: /users/user/projects/project1/jsconfig.json : {
   "configFilePath": "/users/user/projects/project1/jsconfig.json"
  }
 }
+TI:: [hh:mm:ss:mss] Closing file watchers for project '/users/user/projects/project1/jsconfig.json'
+TI:: [hh:mm:ss:mss] Sending response:
+    {
+      "kind": "action::watchTypingLocations",
+      "projectName": "/users/user/projects/project1/jsconfig.json",
+      "files": []
+    }
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /users/user/projects/project1/bower_components 1 undefined Project: /users/user/projects/project1/jsconfig.json WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /users/user/projects/project1/bower_components 1 undefined Project: /users/user/projects/project1/jsconfig.json WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /users/user/projects/project1/node_modules 1 undefined Project: /users/user/projects/project1/jsconfig.json WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /users/user/projects/project1/node_modules 1 undefined Project: /users/user/projects/project1/jsconfig.json WatchType: Directory location for typing installer
+TI:: [hh:mm:ss:mss] Closing file watchers for project '/users/user/projects/project1/jsconfig.json' - done.
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /users/user/projects/project1/jsconfig.json
 Info seq  [hh:mm:ss:mss] File '/home/src/Library/Caches/typescript/node_modules/@types/bar/package.json' does not exist according to earlier cached lookups.
 Info seq  [hh:mm:ss:mss] File '/home/src/Library/Caches/typescript/node_modules/@types/package.json' does not exist according to earlier cached lookups.
@@ -1432,6 +1444,70 @@ Info seq  [hh:mm:ss:mss] event:
     }
 After running Timeout callback:: count: 0
 
+PolledWatches::
+/home/src/Library/Caches/typescript/node_modules/@types/bar/package.json:
+  {"pollingInterval":2000}
+/home/src/Library/Caches/typescript/node_modules/@types/foo/package.json:
+  {"pollingInterval":2000}
+/home/src/Library/Caches/typescript/node_modules/@types/package.json:
+  {"pollingInterval":2000}
+/home/src/Library/Caches/typescript/node_modules/package.json:
+  {"pollingInterval":2000}
+/users/user/projects/node_modules/@types:
+  {"pollingInterval":500}
+/users/user/projects/node_modules/bar/package.json:
+  {"pollingInterval":2000}
+/users/user/projects/node_modules/package.json:
+  {"pollingInterval":2000}
+/users/user/projects/package.json:
+  {"pollingInterval":2000}
+/users/user/projects/project1/node_modules:
+  {"pollingInterval":500}
+/users/user/projects/project1/node_modules/@types:
+  {"pollingInterval":500}
+/users/user/projects/project2/bower_components:
+  {"pollingInterval":500}
+/users/user/projects/project2/node_modules:
+  {"pollingInterval":500}
+/users/user/projects/project2/node_modules/@types:
+  {"pollingInterval":500}
+/users/user/projects/project3/node_modules:
+  {"pollingInterval":500}
+/users/user/projects/project3/node_modules/@types:
+  {"pollingInterval":500}
+
+PolledWatches *deleted*::
+/users/user/projects/project1/bower_components:
+  {"pollingInterval":500}
+
+FsWatches::
+/home/src/Library/Caches/typescript/package.json:
+  {}
+/home/src/tslibs/TS/Lib/lib.d.ts:
+  {}
+/users/user/projects/project1/jsconfig.json:
+  {}
+/users/user/projects/project2/app2.js:
+  {}
+/users/user/projects/project2/jsconfig.json:
+  {}
+/users/user/projects/project3/app2.js:
+  {}
+/users/user/projects/project3/jsconfig.json:
+  {}
+
+FsWatchesRecursive::
+/home/src/Library/Caches/typescript/node_modules:
+  {}
+/users/user/projects/node_modules:
+  {}
+/users/user/projects/project1:
+  {}
+/users/user/projects/project2:
+  {}
+/users/user/projects/project3:
+  {}
+
 Projects::
 /users/user/projects/project1/jsconfig.json (Configured) *changed*
     projectStateVersion: 2
diff --git a/tests/baselines/reference/tsserver/typeAquisition/changes-to-typeAquisition-with-already-aquired-typing-multiple-projects.js b/tests/baselines/reference/tsserver/typeAquisition/changes-to-typeAquisition-with-already-aquired-typing-multiple-projects.js
index f7455ca8849..2afc19046e5 100644
--- a/tests/baselines/reference/tsserver/typeAquisition/changes-to-typeAquisition-with-already-aquired-typing-multiple-projects.js
+++ b/tests/baselines/reference/tsserver/typeAquisition/changes-to-typeAquisition-with-already-aquired-typing-multiple-projects.js
@@ -1353,6 +1353,18 @@ Info seq  [hh:mm:ss:mss] Config: /users/user/projects/project1/jsconfig.json : {
   "configFilePath": "/users/user/projects/project1/jsconfig.json"
  }
 }
+TI:: [hh:mm:ss:mss] Closing file watchers for project '/users/user/projects/project1/jsconfig.json'
+TI:: [hh:mm:ss:mss] Sending response:
+    {
+      "kind": "action::watchTypingLocations",
+      "projectName": "/users/user/projects/project1/jsconfig.json",
+      "files": []
+    }
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /users/user/projects/project1/bower_components 1 undefined Project: /users/user/projects/project1/jsconfig.json WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /users/user/projects/project1/bower_components 1 undefined Project: /users/user/projects/project1/jsconfig.json WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /users/user/projects/project1/node_modules 1 undefined Project: /users/user/projects/project1/jsconfig.json WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /users/user/projects/project1/node_modules 1 undefined Project: /users/user/projects/project1/jsconfig.json WatchType: Directory location for typing installer
+TI:: [hh:mm:ss:mss] Closing file watchers for project '/users/user/projects/project1/jsconfig.json' - done.
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /users/user/projects/project1/jsconfig.json
 Info seq  [hh:mm:ss:mss] File '/home/src/Library/Caches/typescript/node_modules/@types/bar/package.json' does not exist according to earlier cached lookups.
 Info seq  [hh:mm:ss:mss] File '/home/src/Library/Caches/typescript/node_modules/@types/package.json' does not exist according to earlier cached lookups.
@@ -1443,6 +1455,72 @@ Info seq  [hh:mm:ss:mss] event:
     }
 After running Timeout callback:: count: 0
 
+PolledWatches::
+/home/src/Library/Caches/typescript/node_modules/@types/bar/package.json:
+  {"pollingInterval":2000}
+/home/src/Library/Caches/typescript/node_modules/@types/foo/package.json:
+  {"pollingInterval":2000}
+/home/src/Library/Caches/typescript/node_modules/@types/package.json:
+  {"pollingInterval":2000}
+/home/src/Library/Caches/typescript/node_modules/package.json:
+  {"pollingInterval":2000}
+/users/user/projects/node_modules:
+  {"pollingInterval":500}
+/users/user/projects/node_modules/@types:
+  {"pollingInterval":500}
+/users/user/projects/package.json:
+  {"pollingInterval":2000}
+/users/user/projects/project1/node_modules/@types:
+  {"pollingInterval":500}
+/users/user/projects/project2/bower_components:
+  {"pollingInterval":500}
+/users/user/projects/project2/node_modules/@types:
+  {"pollingInterval":500}
+/users/user/projects/project3/node_modules/@types:
+  {"pollingInterval":500}
+/users/user/projects/project3/node_modules/bar/package.json:
+  {"pollingInterval":2000}
+/users/user/projects/project3/node_modules/package.json:
+  {"pollingInterval":2000}
+/users/user/projects/project3/package.json:
+  {"pollingInterval":2000}
+
+PolledWatches *deleted*::
+/users/user/projects/project1/bower_components:
+  {"pollingInterval":500}
+
+FsWatches::
+/home/src/Library/Caches/typescript/package.json:
+  {}
+/home/src/tslibs/TS/Lib/lib.d.ts:
+  {}
+/users/user/projects/project1/jsconfig.json:
+  {}
+/users/user/projects/project2/app2.js:
+  {}
+/users/user/projects/project2/jsconfig.json:
+  {}
+/users/user/projects/project3/app2.js:
+  {}
+/users/user/projects/project3/jsconfig.json:
+  {}
+
+FsWatchesRecursive::
+/home/src/Library/Caches/typescript/node_modules:
+  {}
+/users/user/projects/project1:
+  {}
+/users/user/projects/project1/node_modules:
+  {}
+/users/user/projects/project2:
+  {}
+/users/user/projects/project2/node_modules:
+  {}
+/users/user/projects/project3:
+  {}
+/users/user/projects/project3/node_modules:
+  {}
+
 Projects::
 /users/user/projects/project1/jsconfig.json (Configured) *changed*
     projectStateVersion: 2
diff --git a/tests/baselines/reference/tsserver/typeAquisition/changes-to-typeAquisition-with-already-aquired-typing.js b/tests/baselines/reference/tsserver/typeAquisition/changes-to-typeAquisition-with-already-aquired-typing.js
index a8c6d64d325..8b6d12011fa 100644
--- a/tests/baselines/reference/tsserver/typeAquisition/changes-to-typeAquisition-with-already-aquired-typing.js
+++ b/tests/baselines/reference/tsserver/typeAquisition/changes-to-typeAquisition-with-already-aquired-typing.js
@@ -586,6 +586,18 @@ Info seq  [hh:mm:ss:mss] Config: /users/user/projects/project1/jsconfig.json : {
   "configFilePath": "/users/user/projects/project1/jsconfig.json"
  }
 }
+TI:: [hh:mm:ss:mss] Closing file watchers for project '/users/user/projects/project1/jsconfig.json'
+TI:: [hh:mm:ss:mss] Sending response:
+    {
+      "kind": "action::watchTypingLocations",
+      "projectName": "/users/user/projects/project1/jsconfig.json",
+      "files": []
+    }
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /users/user/projects/project1/bower_components 1 undefined Project: /users/user/projects/project1/jsconfig.json WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /users/user/projects/project1/bower_components 1 undefined Project: /users/user/projects/project1/jsconfig.json WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /users/user/projects/project1/node_modules 1 undefined Project: /users/user/projects/project1/jsconfig.json WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /users/user/projects/project1/node_modules 1 undefined Project: /users/user/projects/project1/jsconfig.json WatchType: Directory location for typing installer
+TI:: [hh:mm:ss:mss] Closing file watchers for project '/users/user/projects/project1/jsconfig.json' - done.
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /users/user/projects/project1/jsconfig.json
 Info seq  [hh:mm:ss:mss] File '/home/src/Library/Caches/typescript/node_modules/@types/bar/package.json' does not exist according to earlier cached lookups.
 Info seq  [hh:mm:ss:mss] File '/home/src/Library/Caches/typescript/node_modules/@types/package.json' does not exist according to earlier cached lookups.
@@ -650,6 +662,40 @@ Info seq  [hh:mm:ss:mss] event:
     }
 After running Timeout callback:: count: 0
 
+PolledWatches::
+/home/src/Library/Caches/typescript/node_modules/@types/bar/package.json:
+  {"pollingInterval":2000}
+/home/src/Library/Caches/typescript/node_modules/@types/package.json:
+  {"pollingInterval":2000}
+/home/src/Library/Caches/typescript/node_modules/package.json:
+  {"pollingInterval":2000}
+/users/user/projects/node_modules:
+  {"pollingInterval":500}
+/users/user/projects/node_modules/@types:
+  {"pollingInterval":500}
+/users/user/projects/project1/node_modules/@types:
+  {"pollingInterval":500}
+
+PolledWatches *deleted*::
+/users/user/projects/project1/bower_components:
+  {"pollingInterval":500}
+
+FsWatches::
+/home/src/Library/Caches/typescript/package.json:
+  {}
+/home/src/tslibs/TS/Lib/lib.d.ts:
+  {}
+/users/user/projects/project1/jsconfig.json:
+  {}
+
+FsWatchesRecursive::
+/home/src/Library/Caches/typescript/node_modules:
+  {}
+/users/user/projects/project1:
+  {}
+/users/user/projects/project1/node_modules:
+  {}
+
 Projects::
 /users/user/projects/project1/jsconfig.json (Configured) *changed*
     projectStateVersion: 3
diff --git a/tests/baselines/reference/tsserver/typeAquisition/midway-changes-to-typeAquisition-when-typing-installer-installs-typing-multiple-projects-with-shared-resolution.js b/tests/baselines/reference/tsserver/typeAquisition/midway-changes-to-typeAquisition-when-typing-installer-installs-typing-multiple-projects-with-shared-resolution.js
index b89844ed974..5e25603189f 100644
--- a/tests/baselines/reference/tsserver/typeAquisition/midway-changes-to-typeAquisition-when-typing-installer-installs-typing-multiple-projects-with-shared-resolution.js
+++ b/tests/baselines/reference/tsserver/typeAquisition/midway-changes-to-typeAquisition-when-typing-installer-installs-typing-multiple-projects-with-shared-resolution.js
@@ -1734,6 +1734,18 @@ Info seq  [hh:mm:ss:mss] Config: /users/user/projects/project1/jsconfig.json : {
   "configFilePath": "/users/user/projects/project1/jsconfig.json"
  }
 }
+TI:: [hh:mm:ss:mss] Closing file watchers for project '/users/user/projects/project1/jsconfig.json'
+TI:: [hh:mm:ss:mss] Sending response:
+    {
+      "kind": "action::watchTypingLocations",
+      "projectName": "/users/user/projects/project1/jsconfig.json",
+      "files": []
+    }
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /users/user/projects/project1/bower_components 1 undefined Project: /users/user/projects/project1/jsconfig.json WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /users/user/projects/project1/bower_components 1 undefined Project: /users/user/projects/project1/jsconfig.json WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /users/user/projects/project1/node_modules 1 undefined Project: /users/user/projects/project1/jsconfig.json WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /users/user/projects/project1/node_modules 1 undefined Project: /users/user/projects/project1/jsconfig.json WatchType: Directory location for typing installer
+TI:: [hh:mm:ss:mss] Closing file watchers for project '/users/user/projects/project1/jsconfig.json' - done.
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /users/user/projects/project1/jsconfig.json
 Info seq  [hh:mm:ss:mss] File '/users/user/projects/node_modules/bar/package.json' does not exist according to earlier cached lookups.
 Info seq  [hh:mm:ss:mss] File '/users/user/projects/node_modules/package.json' does not exist according to earlier cached lookups.
@@ -1821,8 +1833,6 @@ PolledWatches::
   {"pollingInterval":2000}
 /users/user/projects/package.json:
   {"pollingInterval":2000}
-/users/user/projects/project1/bower_components:
-  {"pollingInterval":500}
 /users/user/projects/project1/node_modules:
   {"pollingInterval":500}
 /users/user/projects/project1/node_modules/@types:
@@ -1838,6 +1848,10 @@ PolledWatches::
 /users/user/projects/project3/node_modules/@types:
   {"pollingInterval":500}
 
+PolledWatches *deleted*::
+/users/user/projects/project1/bower_components:
+  {"pollingInterval":500}
+
 FsWatches::
 /home/src/Library/Caches/typescript/package.json:
   {}
diff --git a/tests/baselines/reference/tsserver/typeAquisition/midway-changes-to-typeAquisition-when-typing-installer-installs-typing-multiple-projects.js b/tests/baselines/reference/tsserver/typeAquisition/midway-changes-to-typeAquisition-when-typing-installer-installs-typing-multiple-projects.js
index 17950730a5b..40bb9c6acad 100644
--- a/tests/baselines/reference/tsserver/typeAquisition/midway-changes-to-typeAquisition-when-typing-installer-installs-typing-multiple-projects.js
+++ b/tests/baselines/reference/tsserver/typeAquisition/midway-changes-to-typeAquisition-when-typing-installer-installs-typing-multiple-projects.js
@@ -1788,6 +1788,18 @@ Info seq  [hh:mm:ss:mss] Config: /users/user/projects/project1/jsconfig.json : {
   "configFilePath": "/users/user/projects/project1/jsconfig.json"
  }
 }
+TI:: [hh:mm:ss:mss] Closing file watchers for project '/users/user/projects/project1/jsconfig.json'
+TI:: [hh:mm:ss:mss] Sending response:
+    {
+      "kind": "action::watchTypingLocations",
+      "projectName": "/users/user/projects/project1/jsconfig.json",
+      "files": []
+    }
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /users/user/projects/project1/bower_components 1 undefined Project: /users/user/projects/project1/jsconfig.json WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /users/user/projects/project1/bower_components 1 undefined Project: /users/user/projects/project1/jsconfig.json WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /users/user/projects/project1/node_modules 1 undefined Project: /users/user/projects/project1/jsconfig.json WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /users/user/projects/project1/node_modules 1 undefined Project: /users/user/projects/project1/jsconfig.json WatchType: Directory location for typing installer
+TI:: [hh:mm:ss:mss] Closing file watchers for project '/users/user/projects/project1/jsconfig.json' - done.
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /users/user/projects/project1/jsconfig.json
 Info seq  [hh:mm:ss:mss] File '/users/user/projects/project1/node_modules/bar/package.json' does not exist according to earlier cached lookups.
 Info seq  [hh:mm:ss:mss] File '/users/user/projects/project1/node_modules/package.json' does not exist according to earlier cached lookups.
@@ -1874,8 +1886,6 @@ PolledWatches::
   {"pollingInterval":500}
 /users/user/projects/package.json:
   {"pollingInterval":2000}
-/users/user/projects/project1/bower_components:
-  {"pollingInterval":500}
 /users/user/projects/project1/node_modules/@types:
   {"pollingInterval":500}
 /users/user/projects/project1/node_modules/bar/package.json:
@@ -1898,6 +1908,8 @@ PolledWatches::
   {"pollingInterval":2000}
 
 PolledWatches *deleted*::
+/users/user/projects/project1/bower_components:
+  {"pollingInterval":500}
 /users/user/projects/project2/node_modules/bar/package.json:
   {"pollingInterval":2000}
 /users/user/projects/project2/node_modules/package.json:
diff --git a/tests/baselines/reference/tsserver/typeAquisition/midway-changes-to-typeAquisition-when-typing-installer-installs-typing.js b/tests/baselines/reference/tsserver/typeAquisition/midway-changes-to-typeAquisition-when-typing-installer-installs-typing.js
index 0d7f473e9cf..1628aa9fa13 100644
--- a/tests/baselines/reference/tsserver/typeAquisition/midway-changes-to-typeAquisition-when-typing-installer-installs-typing.js
+++ b/tests/baselines/reference/tsserver/typeAquisition/midway-changes-to-typeAquisition-when-typing-installer-installs-typing.js
@@ -596,6 +596,18 @@ Info seq  [hh:mm:ss:mss] Config: /users/user/projects/project1/jsconfig.json : {
   "configFilePath": "/users/user/projects/project1/jsconfig.json"
  }
 }
+TI:: [hh:mm:ss:mss] Closing file watchers for project '/users/user/projects/project1/jsconfig.json'
+TI:: [hh:mm:ss:mss] Sending response:
+    {
+      "kind": "action::watchTypingLocations",
+      "projectName": "/users/user/projects/project1/jsconfig.json",
+      "files": []
+    }
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /users/user/projects/project1/bower_components 1 undefined Project: /users/user/projects/project1/jsconfig.json WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /users/user/projects/project1/bower_components 1 undefined Project: /users/user/projects/project1/jsconfig.json WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /users/user/projects/project1/node_modules 1 undefined Project: /users/user/projects/project1/jsconfig.json WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /users/user/projects/project1/node_modules 1 undefined Project: /users/user/projects/project1/jsconfig.json WatchType: Directory location for typing installer
+TI:: [hh:mm:ss:mss] Closing file watchers for project '/users/user/projects/project1/jsconfig.json' - done.
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /users/user/projects/project1/jsconfig.json
 Info seq  [hh:mm:ss:mss] File '/users/user/projects/project1/node_modules/bar/package.json' does not exist according to earlier cached lookups.
 Info seq  [hh:mm:ss:mss] File '/users/user/projects/project1/node_modules/package.json' does not exist according to earlier cached lookups.
@@ -696,6 +708,38 @@ Info seq  [hh:mm:ss:mss] event:
     }
 After running Timeout callback:: count: 0
 
+PolledWatches::
+/users/user/projects/node_modules:
+  {"pollingInterval":500}
+/users/user/projects/node_modules/@types:
+  {"pollingInterval":500}
+/users/user/projects/package.json:
+  {"pollingInterval":2000}
+/users/user/projects/project1/node_modules/@types:
+  {"pollingInterval":500}
+/users/user/projects/project1/node_modules/bar/package.json:
+  {"pollingInterval":2000}
+/users/user/projects/project1/node_modules/package.json:
+  {"pollingInterval":2000}
+/users/user/projects/project1/package.json:
+  {"pollingInterval":2000}
+
+PolledWatches *deleted*::
+/users/user/projects/project1/bower_components:
+  {"pollingInterval":500}
+
+FsWatches::
+/home/src/tslibs/TS/Lib/lib.d.ts:
+  {}
+/users/user/projects/project1/jsconfig.json:
+  {}
+
+FsWatchesRecursive::
+/users/user/projects/project1:
+  {}
+/users/user/projects/project1/node_modules:
+  {}
+
 Projects::
 /users/user/projects/project1/jsconfig.json (Configured) *changed*
     projectStateVersion: 2
diff --git a/tests/baselines/reference/tsserver/typeAquisition/receives-update-of-typings-after-project-changes-multiple-projects-with-shared-resolution.js b/tests/baselines/reference/tsserver/typeAquisition/receives-update-of-typings-after-project-changes-multiple-projects-with-shared-resolution.js
index 464363a57e6..9a06dad26ef 100644
--- a/tests/baselines/reference/tsserver/typeAquisition/receives-update-of-typings-after-project-changes-multiple-projects-with-shared-resolution.js
+++ b/tests/baselines/reference/tsserver/typeAquisition/receives-update-of-typings-after-project-changes-multiple-projects-with-shared-resolution.js
@@ -1292,6 +1292,18 @@ Info seq  [hh:mm:ss:mss] Config: /users/user/projects/project1/jsconfig.json : {
   "configFilePath": "/users/user/projects/project1/jsconfig.json"
  }
 }
+TI:: [hh:mm:ss:mss] Closing file watchers for project '/users/user/projects/project1/jsconfig.json'
+TI:: [hh:mm:ss:mss] Sending response:
+    {
+      "kind": "action::watchTypingLocations",
+      "projectName": "/users/user/projects/project1/jsconfig.json",
+      "files": []
+    }
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /users/user/projects/project1/bower_components 1 undefined Project: /users/user/projects/project1/jsconfig.json WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /users/user/projects/project1/bower_components 1 undefined Project: /users/user/projects/project1/jsconfig.json WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /users/user/projects/project1/node_modules 1 undefined Project: /users/user/projects/project1/jsconfig.json WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /users/user/projects/project1/node_modules 1 undefined Project: /users/user/projects/project1/jsconfig.json WatchType: Directory location for typing installer
+TI:: [hh:mm:ss:mss] Closing file watchers for project '/users/user/projects/project1/jsconfig.json' - done.
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /users/user/projects/project1/jsconfig.json
 Info seq  [hh:mm:ss:mss] File '/users/user/projects/node_modules/bar/package.json' does not exist according to earlier cached lookups.
 Info seq  [hh:mm:ss:mss] File '/users/user/projects/node_modules/package.json' does not exist according to earlier cached lookups.
@@ -1384,6 +1396,68 @@ Info seq  [hh:mm:ss:mss] event:
     }
 After running Timeout callback:: count: 0
 
+PolledWatches::
+/home/src/Library/Caches/typescript/node_modules/@types/foo/package.json:
+  {"pollingInterval":2000}
+/home/src/Library/Caches/typescript/node_modules/@types/package.json:
+  {"pollingInterval":2000}
+/home/src/Library/Caches/typescript/node_modules/package.json:
+  {"pollingInterval":2000}
+/users/user/projects/node_modules/@types:
+  {"pollingInterval":500}
+/users/user/projects/node_modules/bar/package.json:
+  {"pollingInterval":2000}
+/users/user/projects/node_modules/package.json:
+  {"pollingInterval":2000}
+/users/user/projects/package.json:
+  {"pollingInterval":2000}
+/users/user/projects/project1/node_modules:
+  {"pollingInterval":500}
+/users/user/projects/project1/node_modules/@types:
+  {"pollingInterval":500}
+/users/user/projects/project2/bower_components:
+  {"pollingInterval":500}
+/users/user/projects/project2/node_modules:
+  {"pollingInterval":500}
+/users/user/projects/project2/node_modules/@types:
+  {"pollingInterval":500}
+/users/user/projects/project3/node_modules:
+  {"pollingInterval":500}
+/users/user/projects/project3/node_modules/@types:
+  {"pollingInterval":500}
+
+PolledWatches *deleted*::
+/users/user/projects/project1/bower_components:
+  {"pollingInterval":500}
+
+FsWatches::
+/home/src/Library/Caches/typescript/package.json:
+  {}
+/home/src/tslibs/TS/Lib/lib.d.ts:
+  {}
+/users/user/projects/project1/jsconfig.json:
+  {}
+/users/user/projects/project2/app2.js:
+  {}
+/users/user/projects/project2/jsconfig.json:
+  {}
+/users/user/projects/project3/app2.js:
+  {}
+/users/user/projects/project3/jsconfig.json:
+  {}
+
+FsWatchesRecursive::
+/home/src/Library/Caches/typescript/node_modules:
+  {}
+/users/user/projects/node_modules:
+  {}
+/users/user/projects/project1:
+  {}
+/users/user/projects/project2:
+  {}
+/users/user/projects/project3:
+  {}
+
 Projects::
 /users/user/projects/project1/jsconfig.json (Configured) *changed*
     projectStateVersion: 2
@@ -1839,8 +1913,6 @@ PolledWatches::
   {"pollingInterval":2000}
 /users/user/projects/package.json:
   {"pollingInterval":2000}
-/users/user/projects/project1/bower_components:
-  {"pollingInterval":500}
 /users/user/projects/project1/node_modules:
   {"pollingInterval":500}
 /users/user/projects/project1/node_modules/@types:
diff --git a/tests/baselines/reference/tsserver/typeAquisition/receives-update-of-typings-after-project-changes-multiple-projects.js b/tests/baselines/reference/tsserver/typeAquisition/receives-update-of-typings-after-project-changes-multiple-projects.js
index 40bfe68c26a..06501de2b22 100644
--- a/tests/baselines/reference/tsserver/typeAquisition/receives-update-of-typings-after-project-changes-multiple-projects.js
+++ b/tests/baselines/reference/tsserver/typeAquisition/receives-update-of-typings-after-project-changes-multiple-projects.js
@@ -1344,6 +1344,18 @@ Info seq  [hh:mm:ss:mss] Config: /users/user/projects/project1/jsconfig.json : {
   "configFilePath": "/users/user/projects/project1/jsconfig.json"
  }
 }
+TI:: [hh:mm:ss:mss] Closing file watchers for project '/users/user/projects/project1/jsconfig.json'
+TI:: [hh:mm:ss:mss] Sending response:
+    {
+      "kind": "action::watchTypingLocations",
+      "projectName": "/users/user/projects/project1/jsconfig.json",
+      "files": []
+    }
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /users/user/projects/project1/bower_components 1 undefined Project: /users/user/projects/project1/jsconfig.json WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /users/user/projects/project1/bower_components 1 undefined Project: /users/user/projects/project1/jsconfig.json WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /users/user/projects/project1/node_modules 1 undefined Project: /users/user/projects/project1/jsconfig.json WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /users/user/projects/project1/node_modules 1 undefined Project: /users/user/projects/project1/jsconfig.json WatchType: Directory location for typing installer
+TI:: [hh:mm:ss:mss] Closing file watchers for project '/users/user/projects/project1/jsconfig.json' - done.
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /users/user/projects/project1/jsconfig.json
 Info seq  [hh:mm:ss:mss] File '/users/user/projects/project1/node_modules/bar/package.json' does not exist according to earlier cached lookups.
 Info seq  [hh:mm:ss:mss] File '/users/user/projects/project1/node_modules/package.json' does not exist according to earlier cached lookups.
@@ -1437,6 +1449,82 @@ Info seq  [hh:mm:ss:mss] event:
     }
 After running Timeout callback:: count: 0
 
+PolledWatches::
+/home/src/Library/Caches/typescript/node_modules/@types/foo/package.json:
+  {"pollingInterval":2000}
+/home/src/Library/Caches/typescript/node_modules/@types/package.json:
+  {"pollingInterval":2000}
+/home/src/Library/Caches/typescript/node_modules/package.json:
+  {"pollingInterval":2000}
+/users/user/projects/node_modules:
+  {"pollingInterval":500}
+/users/user/projects/node_modules/@types:
+  {"pollingInterval":500}
+/users/user/projects/package.json:
+  {"pollingInterval":2000}
+/users/user/projects/project1/node_modules/@types:
+  {"pollingInterval":500}
+/users/user/projects/project1/node_modules/bar/package.json:
+  {"pollingInterval":2000}
+/users/user/projects/project1/node_modules/package.json:
+  {"pollingInterval":2000}
+/users/user/projects/project1/package.json:
+  {"pollingInterval":2000}
+/users/user/projects/project2/bower_components:
+  {"pollingInterval":500}
+/users/user/projects/project2/node_modules/@types:
+  {"pollingInterval":500}
+/users/user/projects/project2/node_modules/bar/package.json:
+  {"pollingInterval":2000}
+/users/user/projects/project2/node_modules/package.json:
+  {"pollingInterval":2000}
+/users/user/projects/project2/package.json:
+  {"pollingInterval":2000}
+/users/user/projects/project3/node_modules/@types:
+  {"pollingInterval":500}
+/users/user/projects/project3/node_modules/bar/package.json:
+  {"pollingInterval":2000}
+/users/user/projects/project3/node_modules/package.json:
+  {"pollingInterval":2000}
+/users/user/projects/project3/package.json:
+  {"pollingInterval":2000}
+
+PolledWatches *deleted*::
+/users/user/projects/project1/bower_components:
+  {"pollingInterval":500}
+
+FsWatches::
+/home/src/Library/Caches/typescript/package.json:
+  {}
+/home/src/tslibs/TS/Lib/lib.d.ts:
+  {}
+/users/user/projects/project1/jsconfig.json:
+  {}
+/users/user/projects/project2/app2.js:
+  {}
+/users/user/projects/project2/jsconfig.json:
+  {}
+/users/user/projects/project3/app2.js:
+  {}
+/users/user/projects/project3/jsconfig.json:
+  {}
+
+FsWatchesRecursive::
+/home/src/Library/Caches/typescript/node_modules:
+  {}
+/users/user/projects/project1:
+  {}
+/users/user/projects/project1/node_modules:
+  {}
+/users/user/projects/project2:
+  {}
+/users/user/projects/project2/node_modules:
+  {}
+/users/user/projects/project3:
+  {}
+/users/user/projects/project3/node_modules:
+  {}
+
 Projects::
 /users/user/projects/project1/jsconfig.json (Configured) *changed*
     projectStateVersion: 2
@@ -1892,8 +1980,6 @@ PolledWatches::
   {"pollingInterval":500}
 /users/user/projects/package.json:
   {"pollingInterval":2000}
-/users/user/projects/project1/bower_components:
-  {"pollingInterval":500}
 /users/user/projects/project1/node_modules/@types:
   {"pollingInterval":500}
 /users/user/projects/project1/node_modules/bar/package.json:
diff --git a/tests/baselines/reference/tsserver/typeAquisition/receives-update-of-typings-after-project-changes.js b/tests/baselines/reference/tsserver/typeAquisition/receives-update-of-typings-after-project-changes.js
index 6cc2e3f8956..bb01a0bcacc 100644
--- a/tests/baselines/reference/tsserver/typeAquisition/receives-update-of-typings-after-project-changes.js
+++ b/tests/baselines/reference/tsserver/typeAquisition/receives-update-of-typings-after-project-changes.js
@@ -484,6 +484,18 @@ Info seq  [hh:mm:ss:mss] Config: /users/user/projects/project1/jsconfig.json : {
   "configFilePath": "/users/user/projects/project1/jsconfig.json"
  }
 }
+TI:: [hh:mm:ss:mss] Closing file watchers for project '/users/user/projects/project1/jsconfig.json'
+TI:: [hh:mm:ss:mss] Sending response:
+    {
+      "kind": "action::watchTypingLocations",
+      "projectName": "/users/user/projects/project1/jsconfig.json",
+      "files": []
+    }
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /users/user/projects/project1/bower_components 1 undefined Project: /users/user/projects/project1/jsconfig.json WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /users/user/projects/project1/bower_components 1 undefined Project: /users/user/projects/project1/jsconfig.json WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /users/user/projects/project1/node_modules 1 undefined Project: /users/user/projects/project1/jsconfig.json WatchType: Directory location for typing installer
+Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /users/user/projects/project1/node_modules 1 undefined Project: /users/user/projects/project1/jsconfig.json WatchType: Directory location for typing installer
+TI:: [hh:mm:ss:mss] Closing file watchers for project '/users/user/projects/project1/jsconfig.json' - done.
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /users/user/projects/project1/jsconfig.json
 Info seq  [hh:mm:ss:mss] File '/users/user/projects/project1/node_modules/bar/package.json' does not exist according to earlier cached lookups.
 Info seq  [hh:mm:ss:mss] File '/users/user/projects/project1/node_modules/package.json' does not exist according to earlier cached lookups.
@@ -551,6 +563,38 @@ Info seq  [hh:mm:ss:mss] event:
     }
 After running Timeout callback:: count: 0
 
+PolledWatches::
+/users/user/projects/node_modules:
+  {"pollingInterval":500}
+/users/user/projects/node_modules/@types:
+  {"pollingInterval":500}
+/users/user/projects/package.json:
+  {"pollingInterval":2000}
+/users/user/projects/project1/node_modules/@types:
+  {"pollingInterval":500}
+/users/user/projects/project1/node_modules/bar/package.json:
+  {"pollingInterval":2000}
+/users/user/projects/project1/node_modules/package.json:
+  {"pollingInterval":2000}
+/users/user/projects/project1/package.json:
+  {"pollingInterval":2000}
+
+PolledWatches *deleted*::
+/users/user/projects/project1/bower_components:
+  {"pollingInterval":500}
+
+FsWatches::
+/home/src/tslibs/TS/Lib/lib.d.ts:
+  {}
+/users/user/projects/project1/jsconfig.json:
+  {}
+
+FsWatchesRecursive::
+/users/user/projects/project1:
+  {}
+/users/user/projects/project1/node_modules:
+  {}
+
 Projects::
 /users/user/projects/project1/jsconfig.json (Configured) *changed*
     projectStateVersion: 2