diff --git a/.editorconfig b/.editorconfig
index c56e285687..aed67c3956 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -9,6 +9,16 @@ indent_style = space
 indent_size = 4
 max_line_length = 120
 ij_java_use_single_class_imports = true
+ij_java_class_count_to_use_import_on_demand = 2147483647
+ij_java_names_count_to_use_import_on_demand = 2147483647
+ij_java_insert_inner_class_imports = false
+ij_java_imports_layout = *, |, javax.**, java.**, |, $*
+ij_java_layout_static_imports_separately = true
+ij_java_doc_add_p_tag_on_empty_lines = false
+ij_java_doc_do_not_wrap_if_one_line = true
+ij_java_doc_keep_empty_parameter_tag = false
+ij_java_doc_keep_empty_throws_tag = false
+ij_java_doc_keep_empty_return_tag = false
 
 [*.json]
 indent_style = space