diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 1531dc973..48125ee16 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -11,7 +11,7 @@ class ApplicationController < ActionController::Base
   end
 
   def not_found
-    raise ActionController::RoutingError, "Not Found"
+    raise ActiveRecord::RecordNotFound, "Not Found"
   end
 
   def efficient_current_user_id
diff --git a/spec/requests/articles_api_spec.rb b/spec/requests/articles_api_spec.rb
index 8b884dcd1..833af64d2 100644
--- a/spec/requests/articles_api_spec.rb
+++ b/spec/requests/articles_api_spec.rb
@@ -141,7 +141,7 @@ RSpec.describe "ArticlesApi", type: :request do
         }
       end
 
-      expect(invalid_update_request).to raise_error(ActionController::RoutingError)
+      expect(invalid_update_request).to raise_error(ActiveRecord::RecordNotFound)
     end
 
     it "does allow super user to update a different article" do
diff --git a/spec/requests/badges_spec.rb b/spec/requests/badges_spec.rb
index 247b8c8ed..851db1719 100644
--- a/spec/requests/badges_spec.rb
+++ b/spec/requests/badges_spec.rb
@@ -14,7 +14,7 @@ RSpec.describe "Badges", type: :request do
 
     context "when badge does not exist" do
       it "renders 404" do
-        expect { get "/badge/that-does-not-exists" }.to raise_error(ActionController::RoutingError)
+        expect { get "/badge/that-does-not-exists" }.to raise_error(ActiveRecord::RecordNotFound)
       end
     end
   end
diff --git a/spec/requests/chat_channels_spec.rb b/spec/requests/chat_channels_spec.rb
index 69e697412..8730ed42e 100644
--- a/spec/requests/chat_channels_spec.rb
+++ b/spec/requests/chat_channels_spec.rb
@@ -87,7 +87,7 @@ RSpec.describe "ChatChannels", type: :request do
 
     context "when request is invalid" do
       it "returns proper error message" do
-        expect { get "/chat_channels/1200" }.to raise_error(ActionController::RoutingError)
+        expect { get "/chat_channels/1200" }.to raise_error(ActiveRecord::RecordNotFound)
       end
     end
   end
diff --git a/spec/requests/delayed_job_spec.rb b/spec/requests/delayed_job_spec.rb
index eff2cd399..2730288ba 100644
--- a/spec/requests/delayed_job_spec.rb
+++ b/spec/requests/delayed_job_spec.rb
@@ -10,7 +10,7 @@ RSpec.describe "Delayed Job web interface", type: :request do
       it "raises 404" do
         expect do
           get "/delayed_job"
-        end.to raise_error(ActionController::RoutingError)
+        end.to raise_error(ActiveRecord::RecordNotFound)
       end
     end
 
@@ -19,7 +19,7 @@ RSpec.describe "Delayed Job web interface", type: :request do
         login_as user
         expect do
           get "/delayed_job"
-        end.to raise_error(ActionController::RoutingError)
+        end.to raise_error(ActiveRecord::RecordNotFound)
       end
     end
 
diff --git a/spec/requests/email_subscriptions_spec.rb b/spec/requests/email_subscriptions_spec.rb
index cba24de97..8de4c48f5 100644
--- a/spec/requests/email_subscriptions_spec.rb
+++ b/spec/requests/email_subscriptions_spec.rb
@@ -29,7 +29,7 @@ RSpec.describe "EmailSubscriptions", type: :request do
 
     it "handles error properly" do
       expect { get email_subscriptions_unsubscribe_url }.
-        to raise_error(ActionController::RoutingError)
+        to raise_error(ActiveRecord::RecordNotFound)
     end
 
     it "won't work if it's past expiration date" do
diff --git a/spec/requests/podcast_episodes_api_spec.rb b/spec/requests/podcast_episodes_api_spec.rb
index aa5bbb2b5..fa0cb6478 100644
--- a/spec/requests/podcast_episodes_api_spec.rb
+++ b/spec/requests/podcast_episodes_api_spec.rb
@@ -30,7 +30,7 @@ RSpec.describe "ArticlesApi", type: :request, vcr: vcr_option do
 
     it "returns nothing is passed invalid podcast slug" do
       expect { get "/api/podcast_episodes?username=nothing_#{rand(1_000_000_000_000_000)}" }.
-        to raise_error(ActionController::RoutingError)
+        to raise_error(ActiveRecord::RecordNotFound)
     end
   end
 end
diff --git a/spec/requests/user_organization_spec.rb b/spec/requests/user_organization_spec.rb
index 343546532..30bddaa0f 100644
--- a/spec/requests/user_organization_spec.rb
+++ b/spec/requests/user_organization_spec.rb
@@ -22,7 +22,7 @@ RSpec.describe "UserOrganization", type: :request do
 
   it "returns 404 if secret is wrong" do
     expect { post "/users/join_org", params: { org_secret: "NOT SECRET" } }.
-      to raise_error ActionController::RoutingError
+      to raise_error ActiveRecord::RecordNotFound
   end
 
   it "leaves org" do
diff --git a/spec/requests/user_settings_spec.rb b/spec/requests/user_settings_spec.rb
index fcaf121c8..c9c7fcf8b 100644
--- a/spec/requests/user_settings_spec.rb
+++ b/spec/requests/user_settings_spec.rb
@@ -23,7 +23,7 @@ RSpec.describe "UserSettings", type: :request do
 
       it "handles unknown settings tab properly" do
         expect { get "/settings/does-not-exist" }.
-          to raise_error(ActionController::RoutingError)
+          to raise_error(ActiveRecord::RecordNotFound)
       end
 
       it "doesn't let user access membership if user has no monthly_dues" do