diff --git a/app/models/spree/order.rb b/app/models/spree/order.rb
index b1731b42d4..32c5e9e151 100644
--- a/app/models/spree/order.rb
+++ b/app/models/spree/order.rb
@@ -662,9 +662,7 @@ module Spree
     end
 
     def total_tax
-      adjustments.sum(:included_tax) +
-        shipment_adjustments.sum(:included_tax) +
-        line_item_adjustments.tax.sum(:amount)
+      additional_tax_total + included_tax_total
     end
 
     def has_taxes_included