diff --git a/app/Mail/TemplateEmail.php b/app/Mail/TemplateEmail.php
index 4b1c1c2acbc3..e04374edd1f9 100644
--- a/app/Mail/TemplateEmail.php
+++ b/app/Mail/TemplateEmail.php
@@ -119,7 +119,8 @@ class TemplateEmail extends Mailable
             ->withSymfonyMessage(function ($message) use ($company) {
                 $message->getHeaders()->addTextHeader('Tag', $company->company_key);
                 $message->invitation = $this->invitation;
-            });
+            })
+            ->tag($company->company_key);
 
         /*In the hosted platform we need to slow things down a little for Storage to catch up.*/
 
diff --git a/app/Mail/VendorTemplateEmail.php b/app/Mail/VendorTemplateEmail.php
index 0fab3bcc9e58..447114621ce0 100644
--- a/app/Mail/VendorTemplateEmail.php
+++ b/app/Mail/VendorTemplateEmail.php
@@ -113,7 +113,8 @@ class VendorTemplateEmail extends Mailable
             ->withSymfonyMessage(function ($message) {
                 $message->getHeaders()->addTextHeader('Tag', $this->company->company_key);
                 $message->invitation = $this->invitation;
-            });
+            })
+            ->tag($this->company->company_key);
 
         /*In the hosted platform we need to slow things down a little for Storage to catch up.*/
         // if (Ninja::isHosted()) {