diff --git a/CHANGELOG.md b/CHANGELOG.md
index 590a8cb4..bf6a6674 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,9 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 ## x.y.z
 
 ### Added
+- Disable php-cs-fixer Yoda conditions
+  ([#791](https://github.com/MyIntervals/emogrifier/issues/791),
+  [#794](https://github.com/MyIntervals/emogrifier/pull/794))
 - Check the code with psalm
   ([#537](https://github.com/MyIntervals/emogrifier/issues/537),
   [#779](https://github.com/MyIntervals/emogrifier/pull/779))
diff --git a/config/php-cs-fixer.php b/config/php-cs-fixer.php
index 250634ec..3d245a50 100644
--- a/config/php-cs-fixer.php
+++ b/config/php-cs-fixer.php
@@ -94,5 +94,10 @@
             'trailing_comma_in_multiline_array' => true,
             'unary_operator_spaces' => true,
             'whitespace_after_comma_in_array' => true,
+            'yoda_style' => [
+                'equal' => false,
+                'identical' => false,
+                'less_and_greater' => false,
+            ],
         ]
     );