diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Documents/VisualStudioFileChangeTrackerFactory.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Documents/VisualStudioFileChangeTrackerFactory.cs
index 2de9cbe2506..0793e7b6734 100644
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Documents/VisualStudioFileChangeTrackerFactory.cs
+++ b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Documents/VisualStudioFileChangeTrackerFactory.cs
@@ -20,7 +20,7 @@ internal class VisualStudioFileChangeTrackerFactory : IFileChangeTrackerFactory
 
     [ImportingConstructor]
     public VisualStudioFileChangeTrackerFactory(
-        SVsServiceProvider serviceProvider,
+        [Import(typeof(SAsyncServiceProvider))] IAsyncServiceProvider serviceProvider,
         JoinableTaskContext joinableTaskContext,
         ProjectSnapshotManagerDispatcher dispatcher,
         IErrorReporter errorReporter)
@@ -30,12 +30,7 @@ public VisualStudioFileChangeTrackerFactory(
         _errorReporter = errorReporter;
 
         var jtf = _joinableTaskContext.Factory;
-        _getFileChangeServiceTask = jtf.RunAsync(async () =>
-        {
-            await jtf.SwitchToMainThreadAsync();
-
-            return (IVsAsyncFileChangeEx)serviceProvider.GetService(typeof(SVsFileChangeEx));
-        });
+        _getFileChangeServiceTask = jtf.RunAsync(serviceProvider.GetServiceAsync<SVsFileChangeEx, IVsAsyncFileChangeEx>);
     }
 
     public IFileChangeTracker Create(string filePath)