diff --git a/app/Listeners/Mail/MailSentListener.php b/app/Listeners/Mail/MailSentListener.php
index 0774daa68c65..4eeca50018cc 100644
--- a/app/Listeners/Mail/MailSentListener.php
+++ b/app/Listeners/Mail/MailSentListener.php
@@ -37,7 +37,7 @@ class MailSentListener implements ShouldQueue
     public function handle(MessageSent $event)
     {
         
-        if(property_exists($event->message, 'invitation')){
+        if(property_exists($event->message, 'invitation') && $event->message->invitation){
 
             MultiDB::setDb($event->message->invitation->company->db);
 
diff --git a/app/Utils/HtmlEngine.php b/app/Utils/HtmlEngine.php
index ae649088f098..f04963499b58 100644
--- a/app/Utils/HtmlEngine.php
+++ b/app/Utils/HtmlEngine.php
@@ -271,7 +271,7 @@ class HtmlEngine
 
         $data['$company.city_state_postal'] = ['value' => $this->company->present()->cityStateZip($this->settings->city, $this->settings->state, $this->settings->postal_code, false) ?: ' ', 'label' => ctrans('texts.city_state_postal')];
         $data['$company.postal_city_state'] = ['value' => $this->company->present()->cityStateZip($this->settings->city, $this->settings->state, $this->settings->postal_code, true) ?: ' ', 'label' => ctrans('texts.postal_city_state')];
-        $data['$company.name'] = ['value' => $this->company->present()->name() ?: ' ', 'label' => ctrans('texts.company_name')];
+        $data['$company.name'] = ['value' => $this->settings->name ?: ' ', 'label' => ctrans('texts.company_name')];
         $data['$company.address1'] = ['value' => $this->settings->address1 ?: ' ', 'label' => ctrans('texts.address1')];
         $data['$company.address2'] = ['value' => $this->settings->address2 ?: ' ', 'label' => ctrans('texts.address2')];
         $data['$company.city'] = ['value' => $this->settings->city ?: ' ', 'label' => ctrans('texts.city')];