diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/MultiLanguageSetting.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/MultiLanguageSetting.java
index 692ba918533..e6cf701c1e5 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/MultiLanguageSetting.java
+++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/MultiLanguageSetting.java
@@ -31,7 +31,7 @@ public class MultiLanguageSetting extends MultiItemsHolder implements ICLanguage
 	 * @see org.eclipse.cdt.core.settings.model.ICLanguageSetting#getLanguageId()
 	 */
 	public String getLanguageId() {
-		return null; // IDs are different.
+		return items[0].getLanguageId(); // Assuming language is the same.
 	}
 
 	/* (non-Javadoc)
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractLangsListTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractLangsListTab.java
index 5d5985aa41b..6f34f17931d 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractLangsListTab.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractLangsListTab.java
@@ -396,10 +396,6 @@ public abstract class AbstractLangsListTab extends AbstractCPropertyTab {
 				if ((langSetting.getSupportedEntryKinds() & getKind()) != 0) {
 					TreeItem t = new TreeItem(langTree, SWT.NONE);
 					String langId = langSetting.getLanguageId();
-					if (langId==null && (langSetting instanceof MultiLanguageSetting)) {
-						ICLanguageSetting item1 = (ICLanguageSetting) ((MultiLanguageSetting)langSetting).getItems()[0];
-						langId = item1.getLanguageId();
-					}
 					if (langId != null && !langId.equals(EMPTY_STR)) {
 						// Bug #178033: get language name via LangManager.
 						ILanguageDescriptor langDes = LanguageManager.getInstance().getLanguageDescriptor(langId);