diff --git a/app/Listeners/Invoice/InvoiceEmailFailedActivity.php b/app/Listeners/Invoice/InvoiceEmailFailedActivity.php
index ff6ed1106d50..9c0285d6db92 100644
--- a/app/Listeners/Invoice/InvoiceEmailFailedActivity.php
+++ b/app/Listeners/Invoice/InvoiceEmailFailedActivity.php
@@ -53,8 +53,9 @@ class InvoiceEmailFailedActivity implements ShouldQueue
 
         $fields->user_id = $user_id;
 
-        $fields->invoice_id = $event->invitation->invoice->id;
+        $fields->invoice_id = $event->invitation->invoice_id;
         $fields->client_id = $event->invitation->invoice->client_id;
+        $fields->client_contact_id = $event->invitation->client_contact_id;
         $fields->company_id = $event->invitation->invoice->company_id;
         $fields->activity_type_id = Activity::EMAIL_INVOICE_FAILED;
         $fields->notes = $event->message;
diff --git a/app/Listeners/Quote/QuoteEmailActivity.php b/app/Listeners/Quote/QuoteEmailActivity.php
index 7ef8354553a4..192e36c1aa97 100644
--- a/app/Listeners/Quote/QuoteEmailActivity.php
+++ b/app/Listeners/Quote/QuoteEmailActivity.php
@@ -53,7 +53,6 @@ class QuoteEmailActivity implements ShouldQueue
         $fields->client_id = $event->invitation->quote->client_id;
         $fields->company_id = $event->invitation->quote->company_id;
         $fields->client_contact_id = $event->invitation->quote->client_contact_id;
-        $fields->client_id = $event->invitation->quote->client_id;
         $fields->activity_type_id = Activity::EMAIL_QUOTE;
 
         $this->activity_repo->save($fields, $event->invitation, $event->event_vars);