diff --git a/app/controllers/admin/domains_controller.rb b/app/controllers/admin/domains_controller.rb
index be20e83fe..20f47da02 100644
--- a/app/controllers/admin/domains_controller.rb
+++ b/app/controllers/admin/domains_controller.rb
@@ -49,9 +49,7 @@ module Admin
       rollback_history = @domain.json_statuses_history&.[]('admin_store_statuses_history')
       dp = ignore_empty_statuses
       @domain.is_admin = true
-      PaperTrail.request(enabled: false) do
-        @domain.admin_status_update dp[:statuses]
-      end
+      @domain.admin_status_update dp[:statuses]
 
       if @domain.update(dp)
         flash[:notice] = I18n.t('domain_updated')
diff --git a/app/models/domain.rb b/app/models/domain.rb
index 2bab00eab..487c701a9 100644
--- a/app/models/domain.rb
+++ b/app/models/domain.rb
@@ -590,8 +590,10 @@ class Domain < ApplicationRecord
 
   # special handling for admin changing status
   def admin_status_update(update)
-    update_unless_locked_by_registrant(update)
-    update_not_by_locked_statuses(update)
+    PaperTrail.request(enabled: false) do
+      update_unless_locked_by_registrant(update)
+      update_not_by_locked_statuses(update)
+    end
     return unless update
 
     # check for deleted status