diff --git a/platform/code-style-api/src/com/intellij/psi/codeStyle/CodeStyleSettingsManager.java b/platform/code-style-api/src/com/intellij/psi/codeStyle/CodeStyleSettingsManager.java
index 3223093700d0..d43440b4a58b 100644
--- a/platform/code-style-api/src/com/intellij/psi/codeStyle/CodeStyleSettingsManager.java
+++ b/platform/code-style-api/src/com/intellij/psi/codeStyle/CodeStyleSettingsManager.java
@@ -269,6 +269,7 @@ public class CodeStyleSettingsManager implements PersistentStateComponentWithMod
   public final void unregisterCustomSettings(@NotNull Collection<? extends CodeStyleSettings> allSettings,
                                              @NotNull CustomCodeStyleSettingsFactory provider) {
     allSettings.forEach(settings -> settings.removeCustomSettings(provider));
+    CodeStyleSettings.getDefaults().removeCustomSettings(provider);
     notifyCodeStyleSettingsChanged();
   }