diff --git a/app/views/spree/order_mailer/_order_summary.html.haml b/app/views/spree/order_mailer/_order_summary.html.haml
index acd3f39a1b..86b1af1f3b 100644
--- a/app/views/spree/order_mailer/_order_summary.html.haml
+++ b/app/views/spree/order_mailer/_order_summary.html.haml
@@ -44,9 +44,10 @@
       %td{:align => "right"}
         %strong= @order.display_total
 
-    %tr
-      %td{:align => "right", :colspan => "2"}
-        (includes tax):
-      %td{:align => "right"}
-        = display_checkout_tax_total(@order)
+    - if @order.total_tax > 0
+      %tr
+        %td{:align => "right", :colspan => "2"}
+          (includes tax):
+        %td{:align => "right"}
+          = display_checkout_tax_total(@order)
 %p  
diff --git a/app/views/spree/orders/_form.html.haml b/app/views/spree/orders/_form.html.haml
index fe46e06fd2..e71f92452f 100644
--- a/app/views/spree/orders/_form.html.haml
+++ b/app/views/spree/orders/_form.html.haml
@@ -57,8 +57,9 @@
             %h5.order-total.grand-total= @order.display_total
           %td
 
-        %tr
-          %td.text-right{colspan:"3"} (includes tax)
-          %td.text-right
-            %span.order-total.tax-total= display_checkout_tax_total(@order)
-          %td
+        - if @order.total_tax > 0
+          %tr
+            %td.text-right{colspan:"3"} (includes tax)
+            %td.text-right
+              %span.order-total.tax-total= display_checkout_tax_total(@order)
+            %td