diff --git a/.rubocop.yml b/.rubocop.yml
index ee7a25c63d1e5f81585b3bbdf67355191e524860..c20b30c45a15172679804837fdf3d48359e9f8c7 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -519,6 +519,7 @@ Gitlab/AvoidCurrentOrganization:
     - 'ee/lib/api/**/*'
     - 'app/graphql/**/*'
     - 'ee/app/graphql/**/*'
+    - 'lib/gitlab/current_settings.rb'
     - 'lib/gitlab/middleware/organizations/current.rb'
     - 'spec/**/*'
     - 'ee/spec/**/*'
diff --git a/.rubocop_todo/gitlab/avoid_current_organization.yml b/.rubocop_todo/gitlab/avoid_current_organization.yml
index e5e11026f33e61a287ee108e570695365911f4a3..85bb28dcdd29102df15530e32d0853ddba137d96 100644
--- a/.rubocop_todo/gitlab/avoid_current_organization.yml
+++ b/.rubocop_todo/gitlab/avoid_current_organization.yml
@@ -2,5 +2,4 @@
 Gitlab/AvoidCurrentOrganization:
   Details: grace period
   Exclude:
-    - 'lib/gitlab/current_settings.rb'
     - 'lib/gitlab/github_gists_import/importer/gist_importer.rb'