diff --git a/.flake8 b/.flake8
index 48bac2f2003..0301b4263dd 100644
--- a/.flake8
+++ b/.flake8
@@ -2,4 +2,8 @@
 
 [flake8]
 max-line-length = 120
-ignore = E741
+ignore =
+    E741,
+    # W503 and W504 are mutually exclusive, so one or the other must be ignored.
+    # PEP 8 recommends line break before, so we keep W504.
+    W503