diff --git a/.editorconfig b/.editorconfig
index 42f5867c90d2f9cb9267a5fdf9b8f816e44b690c..2c73f926bdb5ab2c4cd50c905a602be2b3efa665 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -13,8 +13,8 @@ indent_style = space
 indent_size = 4
 end_of_line = lf
 charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
+trim_trailing_whitespace = false # These are the correct rules for APM coding standards, but fixing up old files causes git spam
+insert_final_newline = false
 
 [*.mk]
 indent_style = tab