diff --git a/app/Services/Invoice/AddGatewayFee.php b/app/Services/Invoice/AddGatewayFee.php
index bc88092d3048..f7a5005fd7b1 100644
--- a/app/Services/Invoice/AddGatewayFee.php
+++ b/app/Services/Invoice/AddGatewayFee.php
@@ -45,7 +45,7 @@ class AddGatewayFee extends AbstractService
         $gateway_fee = round($this->company_gateway->calcGatewayFee($this->amount), $this->invoice->client->currency()->precision);
 
         if((int)$gateway_fee == 0)
-            return;
+            return $this->invoice;
 
         $this->cleanPendingGatewayFees();
 
diff --git a/app/Transformers/TaskTransformer.php b/app/Transformers/TaskTransformer.php
index 08d18981877b..d5b21a4eacd9 100644
--- a/app/Transformers/TaskTransformer.php
+++ b/app/Transformers/TaskTransformer.php
@@ -33,7 +33,7 @@ class TaskTransformer extends EntityTransformer
         'documents'
     ];
 
-    public function includeDocuments(Vendor $vendor)
+    public function includeDocuments(Task $task)
     {
         $transformer = new DocumentTransformer($this->serializer);