diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/CoreModel.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/CoreModel.java
index 25797a7adbd..f7dda7b3f10 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/CoreModel.java
+++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/CoreModel.java
@@ -20,6 +20,7 @@ import org.eclipse.cdt.core.CCorePlugin;
 import org.eclipse.cdt.core.CProjectNature;
 import org.eclipse.cdt.core.language.settings.providers.ILanguageSettingsProvidersKeeper;
 import org.eclipse.cdt.core.language.settings.providers.LanguageSettingsManager;
+import org.eclipse.cdt.core.language.settings.providers.ScannerDiscoveryLegacySupport;
 import org.eclipse.cdt.core.resources.IPathEntryStore;
 import org.eclipse.cdt.core.settings.model.ICConfigurationDescription;
 import org.eclipse.cdt.core.settings.model.ICLanguageSetting;
@@ -1253,11 +1254,12 @@ public class CoreModel {
 		if(des != null){
 			ICConfigurationDescription indexCfg = des.getDefaultSettingConfiguration();
 			if(indexCfg != null){
-				if(!mngr.isNewStyleCfg(indexCfg)){
+				if (!mngr.isNewStyleCfg(indexCfg)) {
 					return oldIsScannerInformationEmpty(resource);
 				}
 				
-				if (indexCfg instanceof ILanguageSettingsProvidersKeeper) {
+				if (ScannerDiscoveryLegacySupport.isLanguageSettingsProvidersFunctionalityEnabled(project) &&
+						indexCfg instanceof ILanguageSettingsProvidersKeeper) {
 					List<String> languageIds = LanguageSettingsManager.getLanguages(resource, indexCfg);
 					for (String langId : languageIds) {
 						List<ICLanguageSettingEntry> entries = LanguageSettingsManager.getSettingEntriesByKind(indexCfg, resource, langId,