diff --git a/.rubocop.yml b/.rubocop.yml
index 6394a8fe0..5786dfc09 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -80,6 +80,9 @@ Style/AsciiComments:
     # We can not change nor remove it.
     - 'app/models/repository/git.rb'
 
+Style/EmptyElse:
+  EnforcedStyle: empty
+
 Style/FormatStringToken:
   Enabled: false
 
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index badd847f3..5f2dfc681 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1054,10 +1054,7 @@ Style/EmptyCaseCondition:
 # SupportedStyles: empty, nil, both
 Style/EmptyElse:
   Exclude:
-    - 'app/helpers/avatars_helper.rb'
-    - 'app/models/import.rb'
     - 'app/models/mail_handler.rb'
-    - 'app/models/query.rb'
 
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.