diff --git a/bundles/org.eclipse.cdt.lsp/src/org/eclipse/cdt/lsp/internal/server/URIEnableCache.java b/bundles/org.eclipse.cdt.lsp/src/org/eclipse/cdt/lsp/internal/server/URIEnableCache.java
index 70aaac38..170cfb33 100644
--- a/bundles/org.eclipse.cdt.lsp/src/org/eclipse/cdt/lsp/internal/server/URIEnableCache.java
+++ b/bundles/org.eclipse.cdt.lsp/src/org/eclipse/cdt/lsp/internal/server/URIEnableCache.java
@@ -59,6 +59,7 @@ private URIEnableCache() {
 
 	public static void stop() {
 		if (instance != null) {
+			ContentTypeManager.getInstance().removeContentTypeChangeListener(instance);
 			var workbench = PlatformUI.getWorkbench();
 			workbench.removeWindowListener(instance);
 			Arrays.stream(workbench.getWorkbenchWindows()).map(IWorkbenchWindow::getPages).flatMap(Arrays::stream)