diff --git a/platform/lang-api/src/com/intellij/psi/codeStyle/CommonCodeStyleSettings.java b/platform/lang-api/src/com/intellij/psi/codeStyle/CommonCodeStyleSettings.java
index 7a8d84e018be..6b8b9ed34617 100644
--- a/platform/lang-api/src/com/intellij/psi/codeStyle/CommonCodeStyleSettings.java
+++ b/platform/lang-api/src/com/intellij/psi/codeStyle/CommonCodeStyleSettings.java
@@ -918,7 +918,15 @@ public class CommonCodeStyleSettings {
 
     @Override
     public void writeExternal(Element element) throws WriteExternalException {
-      DefaultJDOMExternalizer.writeExternal(this, element, new DifferenceFilter<IndentOptions>(this, new IndentOptions()));
+      DefaultJDOMExternalizer.writeExternal(this, element, new DefaultJDOMExternalizer.JDOMFilter() {
+        @Override
+        public boolean isAccept(@NotNull Field field) {
+          if ("KEEP_INDENTS_ON_EMPTY_LINES".equals(field.getName())) {
+            return KEEP_INDENTS_ON_EMPTY_LINES;
+          }
+          return true;
+        }
+      });
     }
 
     public void serialize(Element indentOptionsElement, final IndentOptions defaultOptions) {