diff --git a/.clang-format b/.clang-format
index 47b20bb57d..63d1a4a6fe 100644
--- a/.clang-format
+++ b/.clang-format
@@ -37,7 +37,7 @@ BraceWrapping:
     BeforeElse: false
     IndentBraces: false
     SplitEmptyFunction: false
-BreakBeforeBinaryOperators: All
+BreakBeforeBinaryOperators: NonAssignment
 BreakBeforeTernaryOperators: true
 BreakStringLiterals: true
 
@@ -56,7 +56,7 @@ SortIncludes: false
 SpaceAfterCStyleCast: true
 SpaceAfterLogicalNot: false
 SpaceBeforeAssignmentOperators: true
-SpaceBeforeParens: Always
+SpaceBeforeParens: ControlStatements
 SpaceBeforeSquareBrackets: false
 SpaceInEmptyBlock: false
 SpaceInEmptyParentheses: false