diff --git a/platform/lang-api/src/com/intellij/psi/codeStyle/CommonCodeStyleSettingsManager.java b/platform/lang-api/src/com/intellij/psi/codeStyle/CommonCodeStyleSettingsManager.java
index d9bc7007fe8a..13fa0a50102b 100644
--- a/platform/lang-api/src/com/intellij/psi/codeStyle/CommonCodeStyleSettingsManager.java
+++ b/platform/lang-api/src/com/intellij/psi/codeStyle/CommonCodeStyleSettingsManager.java
@@ -109,7 +109,8 @@ public class CommonCodeStyleSettingsManager implements JDOMExternalizable {
             if (target == null) {
               target = new Language(languageId) {};
             }
-            final CommonCodeStyleSettings settings = new CommonCodeStyleSettings(target);
+            final CommonCodeStyleSettings defaultSettings = LanguageCodeStyleSettingsProvider.getDefaultCommonSettings(target);
+            final CommonCodeStyleSettings settings = defaultSettings != null ? defaultSettings : new CommonCodeStyleSettings(target);
             settings.readExternal(commonSettingsElement);
             registerCommonSettings(target, settings);
           }