diff --git a/extensions/typescript-language-features/src/features/bufferSyncSupport.ts b/extensions/typescript-language-features/src/features/bufferSyncSupport.ts
index 554dfc22d23120fb1d9ae27efd5ec8ead27073a2..b1993914a09bdbd03b36347e0c513e366428eae0 100644
--- a/extensions/typescript-language-features/src/features/bufferSyncSupport.ts
+++ b/extensions/typescript-language-features/src/features/bufferSyncSupport.ts
@@ -216,8 +216,7 @@ export default class BufferSyncSupport {
 		this.requestDiagnostic(resource);
 	}
 
-	private onDidCloseTextDocument(document: TextDocument): void {
-		const resource = document.uri;
+	public closeResource(resource: Uri): void {
 		const syncedBuffer = this.syncedBuffers.get(resource);
 		if (!syncedBuffer) {
 			return;
@@ -230,6 +229,10 @@ export default class BufferSyncSupport {
 		}
 	}
 
+	private onDidCloseTextDocument(document: TextDocument): void {
+		this.closeResource(document.uri);
+	}
+
 	private onDidChangeTextDocument(e: TextDocumentChangeEvent): void {
 		const syncedBuffer = this.syncedBuffers.get(e.document.uri);
 		if (syncedBuffer) {
diff --git a/extensions/typescript-language-features/src/features/updatePathsOnRename.ts b/extensions/typescript-language-features/src/features/updatePathsOnRename.ts
index 791baff75677abdf2e17ee9bdf4c3428abc97c13..9ebd2b585d6e6112b69220969621c471ad1a82d6 100644
--- a/extensions/typescript-language-features/src/features/updatePathsOnRename.ts
+++ b/extensions/typescript-language-features/src/features/updatePathsOnRename.ts
@@ -71,6 +71,7 @@ export class UpdateImportsOnFileRenameHandler {
 		}
 
 		// Make sure TS knows about file
+		this.bufferSyncSupport.closeResource(oldResource);
 		this.bufferSyncSupport.openTextDocument(document);
 
 		const edits = await this.getEditsForFileRename(document, oldFile, newFile);