diff --git a/app/Jobs/Util/WebhookHandler.php b/app/Jobs/Util/WebhookHandler.php
index aad1fb2d537a..5b5a72019b7f 100644
--- a/app/Jobs/Util/WebhookHandler.php
+++ b/app/Jobs/Util/WebhookHandler.php
@@ -13,6 +13,7 @@ namespace App\Jobs\Util;
 
 use App\Jobs\Util\SystemLogger;
 use App\Libraries\MultiDB;
+use App\Models\Client as ClientModel;
 use App\Models\SystemLog;
 use App\Models\Webhook;
 use App\Transformers\ArraySerializer;
@@ -147,11 +148,12 @@ class WebhookHandler implements ShouldQueue
 
     private function resolveClient()
     {
-        if($this->entity->client()->exists()){
+        //make sure it isn't an instance of the Client Model
+        if((!$this->entity instanceof ClientModel) && $this->entity->client()->exists()){
             return $this->entity->client;
         }
 
-        return $this->company->clients->first();
+        return $this->company->clients()->first();
     }
 
     public function failed($exception)
diff --git a/app/PaymentDrivers/BaseDriver.php b/app/PaymentDrivers/BaseDriver.php
index be410cf1134c..eed36b9ff967 100644
--- a/app/PaymentDrivers/BaseDriver.php
+++ b/app/PaymentDrivers/BaseDriver.php
@@ -287,7 +287,7 @@ class BaseDriver extends AbstractPaymentDriver
 
         $invoices->each(function ($invoice) use ($fee_total) {
             if (collect($invoice->line_items)->contains('type_id', '3')) {
-                $invoice->service()->toggleFeesPaid()->deletePdf()->save();
+                $invoice->service()->toggleFeesPaid()->save();
                 $invoice->client->service()->updateBalance($fee_total)->save();
                 $invoice->ledger()->updateInvoiceBalance($fee_total, "Gateway fee adjustment for invoice {$invoice->number}");
             }