diff --git a/app/controllers/spree/admin/payments_controller.rb b/app/controllers/spree/admin/payments_controller.rb
index 8e2151f86c..0c17f8154a 100644
--- a/app/controllers/spree/admin/payments_controller.rb
+++ b/app/controllers/spree/admin/payments_controller.rb
@@ -1,7 +1,10 @@
+# frozen_string_literal: true
+
 module Spree
   module Admin
     class PaymentsController < Spree::Admin::BaseController
-      before_filter :load_order
+      before_filter :load_order, except: [:show]
+      before_filter :load_payment, only: [:fire, :show]
       before_filter :load_data
       before_filter :can_transition_to_payment
 
@@ -46,8 +49,6 @@ module Spree
       # When a user fires an event, take them back to where they came from
       # (we can't use respond_override because Spree no longer uses respond_with)
       def fire
-        load_payment
-
         event = params[:e]
         return unless event && @payment.payment_source