diff --git a/app/controllers/api/v1/api_controller.rb b/app/controllers/api/v1/api_controller.rb
index 621492929..fd0d5f2b9 100644
--- a/app/controllers/api/v1/api_controller.rb
+++ b/app/controllers/api/v1/api_controller.rb
@@ -1,4 +1,5 @@
-class Api::V1::ApiController < ApiController::Base
+class Api::V1::ApiController < ActionController::API
+  include ActionController::RequestForgeryProtection
   protect_from_forgery with: :null_session, :if => Proc.new { |c| c.request.format.json? }
 
   rescue_from AuthenticationFailed, with: :authentication_failed
diff --git a/config/application.rb b/config/application.rb
index 861679805..37b72d41c 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -15,5 +15,6 @@ class Application < Rails::Application
     # Application configuration can go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded after loading
     # the framework and any gems in your application.
+    config.autoloader = :zeitwerk
   end
 end