diff --git a/build-support/IntelliJ-code-format.xml b/build-support/IntelliJ-code-format.xml
index ae406e6116..8a00334669 100644
--- a/build-support/IntelliJ-code-format.xml
+++ b/build-support/IntelliJ-code-format.xml
@@ -48,7 +48,7 @@ under the License.
   </editorconfig>
   <codeStyleSettings language="JAVA">
     <option name="RIGHT_MARGIN" value="120" />
-    <option name="KEEP_LINE_BREAKS" value="false" />
+    <option name="KEEP_LINE_BREAKS" value="true" />
     <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
     <option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="false" />
     <option name="KEEP_BLANK_LINES_BETWEEN_PACKAGE_DECLARATION_AND_HEADER" value="1" />