diff --git a/Python/Product/PythonTools/PythonTools/LanguageServerClient/PythonLanguageClient.cs b/Python/Product/PythonTools/PythonTools/LanguageServerClient/PythonLanguageClient.cs
index 884d16c74..1cf60a1e9 100644
--- a/Python/Product/PythonTools/PythonTools/LanguageServerClient/PythonLanguageClient.cs
+++ b/Python/Product/PythonTools/PythonTools/LanguageServerClient/PythonLanguageClient.cs
@@ -291,9 +291,8 @@ namespace Microsoft.PythonTools.LanguageServerClient {
 
         public async Task OnServerInitializedAsync() {
             IsInitialized = true;
-
-            // Send to either workspace open or solution open
-            OnWorkspaceOrSolutionOpened();
+            // Set _workspaceFoldersSupported to true and send to either workspace open or solution open
+            OnWorkspaceFolderWatched(this, EventArgs.Empty);
         }
 
         public Task OnServerInitializeFailedAsync(Exception e) {