diff --git a/.rubocop/style.yml b/.rubocop/style.yml
index 1d1c9f98797..e2ded03c8e6 100644
--- a/.rubocop/style.yml
+++ b/.rubocop/style.yml
@@ -15,6 +15,9 @@ Style/FormatStringToken:
     merge:
       - AllowedMethods
 
+Style/GuardClause:
+  Enabled: false
+
 Style/HashAsLastArrayItem:
   Enabled: false
 
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 7f2e858d500..7b1e42d3314 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -5,8 +5,3 @@
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
-
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: MinBodyLength, AllowConsecutiveConditionals.
-Style/GuardClause:
-  Enabled: false