diff --git a/app/Models/CompanyGateway.php b/app/Models/CompanyGateway.php
index 9ca4e81b42ea..ade930f1dfd0 100644
--- a/app/Models/CompanyGateway.php
+++ b/app/Models/CompanyGateway.php
@@ -309,14 +309,14 @@ class CompanyGateway extends BaseModel
         $fees_and_limits = $this->getFeesAndLimits($gateway_type_id);
 
         if (! $fees_and_limits) {
-            return 0;
+            return false;
         }
 
         $fee = 0;
 
         if ($fees_and_limits->fee_amount) {
             $fee += $fees_and_limits->fee_amount;
-            // info("fee after adding fee amount = {$fee}");
+            nlog("fee after adding fee amount = {$fee}");
         }
 
         if ($fees_and_limits->fee_percent) {
@@ -325,7 +325,7 @@ class CompanyGateway extends BaseModel
             } else {
                 $fee += round(($amount * $fees_and_limits->fee_percent / 100), 2);
             }
-            // info("fee after adding fee percent = {$fee}");
+            nlog("fee after adding fee percent = {$fee}");
         }
 
         /* Cap fee if we have to here. */
@@ -334,6 +334,7 @@ class CompanyGateway extends BaseModel
         }
 
         $pre_tax_fee = $fee;
+            nlog("fee after adding fee percent = {$fee}");
 
         /**/
         if ($include_taxes) {
@@ -352,6 +353,7 @@ class CompanyGateway extends BaseModel
                 // info("fee after adding fee tax 3 = {$fee}");
             }
         }
+            nlog("fee after adding fee percent = {$fee}");
 
         return $fee;
     }
diff --git a/app/Services/Invoice/AddGatewayFee.php b/app/Services/Invoice/AddGatewayFee.php
index 073375e7bd2a..430f85dfb662 100644
--- a/app/Services/Invoice/AddGatewayFee.php
+++ b/app/Services/Invoice/AddGatewayFee.php
@@ -43,7 +43,7 @@ class AddGatewayFee extends AbstractService
     {
         $gateway_fee = round($this->company_gateway->calcGatewayFee($this->amount, $this->gateway_type_id, $this->invoice->uses_inclusive_taxes), $this->invoice->client->currency()->precision);
 
-        if ((int)$gateway_fee == 0) 
+        if (!$gateway_fee) 
             return $this->invoice;
 
         // Removes existing stale gateway fees