diff --git a/src/Invoice/InvoiceModel.php b/src/Invoice/InvoiceModel.php
index 26838b48..1c2d650c 100644
--- a/src/Invoice/InvoiceModel.php
+++ b/src/Invoice/InvoiceModel.php
@@ -77,6 +77,10 @@ final class InvoiceModel
      * @var string
      */
     private $invoiceNumber;
+    /**
+     * @var bool
+     */
+    private $hideZeroTax = false;
 
     /**
      * @internal use InvoiceModelFactory
@@ -316,4 +320,14 @@ final class InvoiceModel
 
         return $values;
     }
+
+    public function isHideZeroTax(): bool
+    {
+        return $this->hideZeroTax;
+    }
+
+    public function setHideZeroTax(bool $hideZeroTax): void
+    {
+        $this->hideZeroTax = $hideZeroTax;
+    }
 }
diff --git a/templates/invoice/renderer/default-pdf.pdf.twig b/templates/invoice/renderer/default-pdf.pdf.twig
index e73435da..293eda7b 100644
--- a/templates/invoice/renderer/default-pdf.pdf.twig
+++ b/templates/invoice/renderer/default-pdf.pdf.twig
@@ -130,6 +130,7 @@ mpdf-->
         {% endfor %}
         </tbody>
         <tfoot>
+            {% if model.calculator.tax > 0 or not model.isHideZeroTax() %}
             <tr>
                 <td colspan="4" class="text-right">
                     {{ 'invoice.subtotal'|trans }}
@@ -142,6 +143,7 @@ mpdf-->
                 </td>
                 <td class="last text-right">{{ model.calculator.tax|money(currency) }}</td>
             </tr>
+            {% endif %}
             <tr>
                 <td colspan="4" class="text-right text-nowrap">
                     <strong>{{ 'invoice.total'|trans }}</strong>
diff --git a/templates/invoice/renderer/default.html.twig b/templates/invoice/renderer/default.html.twig
index c87547a0..0faede9f 100644
--- a/templates/invoice/renderer/default.html.twig
+++ b/templates/invoice/renderer/default.html.twig
@@ -98,6 +98,7 @@
             {% endfor %}
             </tbody>
             <tfoot>
+                {% if model.calculator.tax > 0 or not model.isHideZeroTax() %}
                 <tr>
                     <td colspan="4" class="text-right">
                         {{ 'invoice.subtotal'|trans }}
@@ -110,6 +111,7 @@
                     </td>
                     <td class="text-right">{{ model.calculator.tax|money(currency) }}</td>
                 </tr>
+                {% endif %}
                 <tr>
                     <td colspan="4" class="text-right text-nowrap">
                         <strong>{{ 'invoice.total'|trans }}</strong>
@@ -142,4 +144,4 @@
         <strong>{{ 'label.contact'|trans }}</strong>: {{ model.template.contact|nl2str(' &ndash; ') }}
     </p>
 </footer>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/templates/invoice/renderer/freelancer.pdf.twig b/templates/invoice/renderer/freelancer.pdf.twig
index 2864e122..79a6ef38 100644
--- a/templates/invoice/renderer/freelancer.pdf.twig
+++ b/templates/invoice/renderer/freelancer.pdf.twig
@@ -140,6 +140,7 @@ mpdf-->
         {% endfor %}
         </tbody>
         <tfoot>
+            {% if model.calculator.tax > 0 or not model.isHideZeroTax() %}
             <tr>
                 <td colspan="3" class="text-right">
                     {{ 'invoice.subtotal'|trans }}
@@ -152,6 +153,7 @@ mpdf-->
                 </td>
                 <td class="last text-right">{{ model.calculator.tax|money(currency) }}</td>
             </tr>
+            {% endif %}
             <tr>
                 <td colspan="3" class="text-right text-nowrap">
                     <strong>{{ 'invoice.total'|trans }}</strong>