diff --git a/app/Services/Payment/SendEmail.php b/app/Services/Payment/SendEmail.php
index ed07083bc6fa..ac4d1ab16afb 100644
--- a/app/Services/Payment/SendEmail.php
+++ b/app/Services/Payment/SendEmail.php
@@ -11,20 +11,15 @@
 
 namespace App\Services\Payment;
 
+use App\Models\Payment;
+use App\Models\ClientContact;
 use App\Jobs\Payment\EmailPayment;
 
 class SendEmail
 {
-    public $payment;
 
-    public $contact;
-
-    public function __construct($payment, $contact)
-    {
-        $this->payment = $payment;
-
-        $this->contact = $contact;
-    }
+    public function __construct(public Payment $payment, public ?ClientContact $contact)
+    {}
 
     /**
      * Builds the correct template to send.
@@ -34,12 +29,13 @@ class SendEmail
     {
         $this->payment->load('company', 'client.contacts', 'invoices');
 
-        $contact = $this->payment->client->contacts()->first();
+        if(!$this->contact)
+            $this->contact = $this->payment->client->contacts()->first();
 
         // $this->payment->invoices->sortByDesc('id')->first(function ($invoice) {
         //     $invoice->invitations->each(function ($invitation) {
         //         if (!$invitation->contact->trashed() && $invitation->contact->email) {
-                    EmailPayment::dispatch($this->payment, $this->payment->company, $contact);
+                    EmailPayment::dispatch($this->payment, $this->payment->company, $this->contact);
         //         }
         //     });
         // });