diff --git a/config/application.rb b/config/application.rb
index 5c5de3e23a..09fe38065e 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -111,6 +111,9 @@ module Mastodon
     end
 
     config.to_prepare do
+      Doorkeeper::Application.include ApplicationExtension
+      Doorkeeper::AccessGrant.include AccessGrantExtension
+      Doorkeeper::AccessToken.include AccessTokenExtension
       Devise::FailureApp.include AbstractController::Callbacks
       Devise::FailureApp.include Localized
     end
diff --git a/config/initializers/doorkeeper.rb b/config/initializers/doorkeeper.rb
index 2fb690032a..908acb5503 100644
--- a/config/initializers/doorkeeper.rb
+++ b/config/initializers/doorkeeper.rb
@@ -179,9 +179,3 @@ Doorkeeper.configure do
   # WWW-Authenticate Realm (default "Doorkeeper").
   # realm "Doorkeeper"
 end
-
-Rails.application.reloader.to_prepare do
-  Doorkeeper.config.application_model.include ApplicationExtension
-  Doorkeeper.config.access_grant_model.include AccessGrantExtension
-  Doorkeeper.config.access_token_model.include AccessTokenExtension
-end