diff --git a/app/Http/Controllers/BaseController.php b/app/Http/Controllers/BaseController.php
index aec442c9c184..9b03936b5722 100644
--- a/app/Http/Controllers/BaseController.php
+++ b/app/Http/Controllers/BaseController.php
@@ -395,7 +395,8 @@ class BaseController extends Controller
             'company' => function ($query) use ($created_at, $user) {
                 $query->whereNotNull('created_at')->with('documents');
             },
-            'company.clients' => function ($query) use ($user) {
+            'company.clients' => function ($query) use ($created_at, $user) {
+                $query->where('clients.created_at', '>=', $created_at)->with('contacts.company', 'gateway_tokens', 'documents');
 
                 if(!$user->hasPermission('view_client'))
                   $query->where('clients.user_id', $user->id)->orWhere('clients.assigned_user_id', $user->id);
diff --git a/app/Http/Controllers/ClientPortal/InvoiceController.php b/app/Http/Controllers/ClientPortal/InvoiceController.php
index 2300600714c0..9746863da046 100644
--- a/app/Http/Controllers/ClientPortal/InvoiceController.php
+++ b/app/Http/Controllers/ClientPortal/InvoiceController.php
@@ -50,6 +50,8 @@ class InvoiceController extends Controller
     {
         set_time_limit(0);
 
+        $invoice->service()->removeUnpaidGatewayFees()->save();
+
         $data = [
             'invoice' => $invoice,
         ];
diff --git a/app/Http/Controllers/ClientPortal/PaymentController.php b/app/Http/Controllers/ClientPortal/PaymentController.php
index 6d17c3daff54..8531c36fefb1 100644
--- a/app/Http/Controllers/ClientPortal/PaymentController.php
+++ b/app/Http/Controllers/ClientPortal/PaymentController.php
@@ -97,6 +97,10 @@ class PaymentController extends Controller
         $payable_invoices = collect($request->payable_invoices);
         $invoices = Invoice::whereIn('id', $this->transformKeys($payable_invoices->pluck('invoice_id')->toArray()))->get();
 
+        $invoices->each(function($invoice){
+            $invoice->service()->removeUnpaidGatewayFees()->save();
+        });
+
         /* pop non payable invoice from the $payable_invoices array */
 
         $payable_invoices = $payable_invoices->filter(function ($payable_invoice) use ($invoices) {
diff --git a/app/Services/Invoice/InvoiceService.php b/app/Services/Invoice/InvoiceService.php
index 4ae0787809df..3531e0d266f5 100644
--- a/app/Services/Invoice/InvoiceService.php
+++ b/app/Services/Invoice/InvoiceService.php
@@ -110,6 +110,7 @@ class InvoiceService
 
     public function addGatewayFee(CompanyGateway $company_gateway, $gateway_type_id, float $amount)
     {
+
         $this->invoice = (new AddGatewayFee($company_gateway, $gateway_type_id, $this->invoice, $amount))->run();
 
         return $this;