diff --git a/crates/cairo-lang-language-server/src/lib.rs b/crates/cairo-lang-language-server/src/lib.rs
index d009ef85ec8..56031daad75 100644
--- a/crates/cairo-lang-language-server/src/lib.rs
+++ b/crates/cairo-lang-language-server/src/lib.rs
@@ -359,9 +359,6 @@ impl Backend {
         self.state_mutex.lock().await
     }
 
-    // TODO(spapini): Consider managing vfs in a different way, using the
-    // client.send_notification::<UpdateVirtualFile> call.
-
     /// Refresh diagnostics and send diffs to client.
     #[tracing::instrument(level = "debug", skip_all)]
     async fn refresh_diagnostics(&self) -> LSPResult<()> {
diff --git a/vscode-cairo/src/textDocumentProviders.ts b/vscode-cairo/src/textDocumentProviders.ts
index 270805151d0..1a1ddfef2fe 100644
--- a/vscode-cairo/src/textDocumentProviders.ts
+++ b/vscode-cairo/src/textDocumentProviders.ts
@@ -4,8 +4,6 @@ import { Context } from "./context";
 import { expandMacro, vfsProvide, viewAnalyzedCrates } from "./lspRequests";
 
 export const registerVfsProvider = (client: lc.LanguageClient, ctx: Context) => {
-  const eventEmitter = new vscode.EventEmitter<vscode.Uri>();
-
   const vfsProvider: vscode.TextDocumentContentProvider = {
     async provideTextDocumentContent(uri: vscode.Uri): Promise<string> {
       const res = await client.sendRequest(vfsProvide, {
@@ -14,13 +12,8 @@ export const registerVfsProvider = (client: lc.LanguageClient, ctx: Context) =>
 
       return res.content ?? "";
     },
-    onDidChange: eventEmitter.event,
   };
 
-  client.onNotification("vfs/update", (param) => {
-    eventEmitter.fire(param.uri);
-  });
-
   ctx.extension.subscriptions.push(
     vscode.workspace.registerTextDocumentContentProvider("vfs", vfsProvider),
   );