diff --git a/spec/features/errors/page_not_found_404_spec.rb b/spec/features/errors/page_not_found_404_spec.rb
index 2963773d66..2b99dd961c 100644
--- a/spec/features/errors/page_not_found_404_spec.rb
+++ b/spec/features/errors/page_not_found_404_spec.rb
@@ -7,11 +7,13 @@
   before do
     Rails.application.config.consider_all_requests_local = false
     Rails.application.config.action_dispatch.show_exceptions = true
+    Capybara.raise_server_errors = false
   end
 
   after do
     Rails.application.config.consider_all_requests_local = true
     Rails.application.config.action_dispatch.show_exceptions = false
+    Capybara.raise_server_errors = true
   end
 
   it 'should respond with the custom 404 page if the user visits a non-existent page' do