diff --git a/src/VisualStudio/Core/Def/LanguageService/AbstractPackage.cs b/src/VisualStudio/Core/Def/LanguageService/AbstractPackage.cs
index e6babc4236130..64ff1b7dde1fb 100644
--- a/src/VisualStudio/Core/Def/LanguageService/AbstractPackage.cs
+++ b/src/VisualStudio/Core/Def/LanguageService/AbstractPackage.cs
@@ -35,16 +35,17 @@ protected override async Task InitializeAsync(CancellationToken cancellationToke
         Assumes.Present(_componentModel_doNotAccessDirectly);
     }
 
-    protected override Task OnAfterPackageLoadedAsync(CancellationToken cancellationToken)
+    protected override async Task OnAfterPackageLoadedAsync(CancellationToken cancellationToken)
     {
+        await base.OnAfterPackageLoadedAsync(cancellationToken).ConfigureAwait(false);
+
         // TODO: remove, workaround for https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1985204
         var globalOptions = ComponentModel.GetService<IGlobalOptionService>();
         if (globalOptions.GetOption(SemanticSearchFeatureFlag.Enabled))
         {
+            await JoinableTaskFactory.SwitchToMainThreadAsync(cancellationToken);
             UIContext.FromUIContextGuid(new Guid(SemanticSearchFeatureFlag.UIContextId)).IsActive = true;
         }
-
-        return base.OnAfterPackageLoadedAsync(cancellationToken);
     }
 
     protected async Task LoadComponentsInUIContextOnceSolutionFullyLoadedAsync(CancellationToken cancellationToken)