diff --git a/app/models/spree/tax_rate.rb b/app/models/spree/tax_rate.rb
index 2a2e649a4e..588fe91985 100644
--- a/app/models/spree/tax_rate.rb
+++ b/app/models/spree/tax_rate.rb
@@ -110,7 +110,7 @@ module Spree
             "Notice: Tax refund should not be possible, please check the default zone and " \
             "the tax rate zone configuration"
           ) do |payload|
-            payload.add_metadata :order_tax_zone, order.tax_zone
+            payload.add_metadata :order_tax_zone, item.order.tax_zone
             payload.add_metadata :tax_rate_zone, zone
             payload.add_metadata :default_zone, Zone.default_tax
           end
diff --git a/spec/models/spree/tax_rate_spec.rb b/spec/models/spree/tax_rate_spec.rb
index 564c92c141..ae12b8109d 100644
--- a/spec/models/spree/tax_rate_spec.rb
+++ b/spec/models/spree/tax_rate_spec.rb
@@ -392,7 +392,7 @@ module Spree
                 expect(Bugsnag).to receive(:notify).with(
                   "Notice: Tax refund should not be possible, please check the default zone and " \
                   "the tax rate zone configuration"
-                ).twice
+                ).twice.and_call_original
 
                 Spree::TaxRate.adjust(order, order.line_items)
               end