diff --git a/resources/assets/js/pdfmake-ninja.js b/resources/assets/js/pdfmake-ninja.js
index 4da7a5d566..1af1cf4825 100644
--- a/resources/assets/js/pdfmake-ninja.js
+++ b/resources/assets/js/pdfmake-ninja.js
@@ -502,11 +502,11 @@ NINJA.subtotals = function(invoice, hideBalance)
         }
     }
 
-    if (invoice.tax_amount1) {
+    if (invoice.tax_name1) {
         var taxStr = invoice.tax_name1 + ' ' + (invoice.tax_rate1*1).toString() + '%';
         data.push([{text: taxStr, style: ['subtotalsLabel', 'tax1Label']}, {text: formatMoneyInvoice(invoice.tax_amount1, invoice), style: ['subtotals', 'tax1']}]);
     }
-    if (invoice.tax_amount2) {
+    if (invoice.tax_name2) {
         var taxStr = invoice.tax_name2 + ' ' + (invoice.tax_rate2*1).toString() + '%';
         data.push([{text: taxStr, style: ['subtotalsLabel', 'tax2Label']}, {text: formatMoneyInvoice(invoice.tax_amount2, invoice), style: ['subtotals', 'tax2']}]);
     }
diff --git a/resources/assets/js/script.js b/resources/assets/js/script.js
index 348df2c05f..aab4531977 100644
--- a/resources/assets/js/script.js
+++ b/resources/assets/js/script.js
@@ -651,12 +651,12 @@ function calculateAmounts(invoice) {
         invoice.has_product_key = true;
     }
 
-    if (item.tax_rate1 && parseFloat(item.tax_rate1)) {
+    if (item.tax_name1) {
       taxRate1 = parseFloat(item.tax_rate1);
       taxName1 = item.tax_name1;
     }
 
-    if (item.tax_rate2 && parseFloat(item.tax_rate2)) {
+    if (item.tax_name2) {
       taxRate2 = parseFloat(item.tax_rate2);
       taxName2 = item.tax_name2;
     }
@@ -672,7 +672,7 @@ function calculateAmounts(invoice) {
     }
 
     var taxAmount1 = roundToTwo(lineTotal * taxRate1 / 100);
-    if (taxAmount1) {
+    if (taxName1) {
       var key = taxName1 + taxRate1;
       if (taxes.hasOwnProperty(key)) {
         taxes[key].amount += taxAmount1;
@@ -682,7 +682,7 @@ function calculateAmounts(invoice) {
     }
 
     var taxAmount2 = roundToTwo(lineTotal * taxRate2 / 100);
-    if (taxAmount2) {
+    if (taxName2) {
       var key = taxName2 + taxRate2;
       if (taxes.hasOwnProperty(key)) {
         taxes[key].amount += taxAmount2;