diff --git a/app/helpers/admin/orders_helper.rb b/app/helpers/admin/orders_helper.rb
index 743b86ab6f..bd64bbe1c4 100644
--- a/app/helpers/admin/orders_helper.rb
+++ b/app/helpers/admin/orders_helper.rb
@@ -1,7 +1,14 @@
 module Admin
   module OrdersHelper
     def order_adjustments(order)
-      order.adjustments.eligible
+      order.adjustments.eligible.select do |adjustment|
+        type = adjustment.originator_type
+
+        is_shipping_method_fee = (type == 'Spree::ShippingMethod')
+        is_zero_tax_rate = (type == 'Spree::TaxRate' && adjustment.amount.zero?)
+
+        !is_shipping_method_fee && !is_zero_tax_rate
+      end
     end
   end
 end
diff --git a/app/views/spree/admin/orders/_form/_adjustments.html.haml b/app/views/spree/admin/orders/_form/_adjustments.html.haml
index 8dfb0c37c5..ad9559d63d 100644
--- a/app/views/spree/admin/orders/_form/_adjustments.html.haml
+++ b/app/views/spree/admin/orders/_form/_adjustments.html.haml
@@ -8,8 +8,7 @@
           %th= Spree.t('amount')
       %tbody.with-border
         - adjustments.each do |adjustment|
-          - if (adjustment.originator_type != 'Spree::ShippingMethod') && !(adjustment.originator_type == 'Spree::TaxRate' && adjustment.amount == 0)
-            %tr.total
-              %td.strong= adjustment.label + ":"
-              %td.total.align-center
-                %span= Spree::Money.new(adjustment.amount)
+          %tr.total
+            %td.strong= adjustment.label + ":"
+            %td.total.align-center
+              %span= Spree::Money.new(adjustment.amount)