diff --git a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/OSGI-INF/l10n/bundle.properties b/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/OSGI-INF/l10n/bundle.properties
index edc62e5f8c4..19675c4c963 100644
--- a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/OSGI-INF/l10n/bundle.properties
+++ b/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/OSGI-INF/l10n/bundle.properties
@@ -6,4 +6,7 @@ server.label = C/C++ Language Server
 
 reindex.command.name = Reindex
 reindex.command.label = Reindex
-PreferencePageTitle=C/C++ Language Server
\ No newline at end of file
+
+cDocumentSetupParticipant =C Document Setup Participant
+
+PreferencePageTitle=C/C++ Language Server
diff --git a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/plugin.xml b/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/plugin.xml
index 8816ee5b2b0..58929f970e5 100644
--- a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/plugin.xml
+++ b/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/plugin.xml
@@ -24,6 +24,15 @@
             id="org.eclipse.lsp4e.languages.cpp">
       </contentTypeMapping>
    </extension>
+   <extension
+         id="org.eclipse.lsp4e.cpp.language.CDocumentSetupParticipant"
+         name="%cDocumentSetupParticipant"
+         point="org.eclipse.core.filebuffers.documentSetup">
+      <participant
+            class="org.eclipse.cdt.internal.ui.editor.CDocumentSetupParticipant"
+            contentTypeId="org.eclipse.lsp4e.languages.cpp">
+      </participant>
+   </extension>
    <extension
          point="org.eclipse.ui.editors">
       <editorContentTypeBinding
diff --git a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/PresentationReconcilerCPP.java b/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/PresentationReconcilerCPP.java
index e50d187fbca..520e531d359 100644
--- a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/PresentationReconcilerCPP.java
+++ b/lsp4e-cpp/org.eclipse.lsp4e.cpp.language/src/org/eclipse/lsp4e/cpp/language/PresentationReconcilerCPP.java
@@ -58,7 +58,6 @@ public class PresentationReconcilerCPP extends CPresentationReconciler {
 	private CCommentScanner fMultilineCommentScanner;
 	private SingleTokenCScanner fStringScanner;
 	private AbstractCScanner fCodeScanner;
-	private boolean fSettingPartitioner = false;
 	private CqueryLineBackgroundListener fLineBackgroundListener = new CqueryLineBackgroundListener();
 	private ITextViewer textViewer;
 	private TextInputListenerCPP textInputListener;
@@ -155,16 +154,6 @@ public class PresentationReconcilerCPP extends CPresentationReconciler {
 
 	@Override
 	protected TextPresentation createPresentation(IRegion damage, IDocument document) {
-		if (fSettingPartitioner) {
-			return null;
-		}
-		//FIXME: Need a better place to set the partitioner
-		if (!(document.getDocumentPartitioner() instanceof FastCPartitioner)) {
-			// Prevent infinite recursion
-			fSettingPartitioner = true;
-			CUIPlugin.getDefault().getTextTools().setupCDocument(document);
-			fSettingPartitioner = false;
-		}
 		TextPresentation createPresentation = super.createPresentation(damage, document);
 		return createPresentation;
 	}