diff --git a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/CPPResourceChangeListener.java b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/CPPResourceChangeListener.java
index 10fa5ae117e..123d8d28c32 100644
--- a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/CPPResourceChangeListener.java
+++ b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/CPPResourceChangeListener.java
@@ -63,7 +63,7 @@ final class CPPResourceChangeListener implements IResourceChangeListener {
 	private static void sendFileEvents(LanguageServerWrapper wrapper, List<FileEvent> fileEvents) {
 		if (!fileEvents.isEmpty()) {
 			DidChangeWatchedFilesParams params = new DidChangeWatchedFilesParams(fileEvents);
-			wrapper.getServer().getWorkspaceService().didChangeWatchedFiles(params);
+			wrapper.getInitializedServer().join().getWorkspaceService().didChangeWatchedFiles(params);
 		}
 	}