diff --git a/config/initializers/tenanting/account_slug.rb b/config/initializers/tenanting/account_slug.rb
index 2def93d8c..dffbb6bf8 100644
--- a/config/initializers/tenanting/account_slug.rb
+++ b/config/initializers/tenanting/account_slug.rb
@@ -44,5 +44,5 @@ module AccountSlug
 end
 
 Rails.application.config.middleware.tap do |stack|
-  stack.insert_before Rails::Rack::Logger, AccountSlug::Extractor
+  stack.insert_before ActiveRecord::Middleware::DatabaseSelector, AccountSlug::Extractor
 end