diff --git a/app/logical/danbooru_maintenance.rb b/app/logical/danbooru_maintenance.rb
index c969b040b..b87e05e10 100644
--- a/app/logical/danbooru_maintenance.rb
+++ b/app/logical/danbooru_maintenance.rb
@@ -35,8 +35,12 @@ module DanbooruMaintenance
 
   def safely(&block)
     ActiveRecord::Base.connection.execute("set statement_timeout = 0")
-    yield
+
+    CurrentUser.scoped(User.system, "127.0.0.1") do
+      yield
+    end
   rescue StandardError => exception
     DanbooruLogger.log(exception)
+    raise exception if Rails.env.test?
   end
 end