diff --git a/app/Mail/TemplateEmail.php b/app/Mail/TemplateEmail.php
index e04374edd1f9..4ec31fd6ccdd 100644
--- a/app/Mail/TemplateEmail.php
+++ b/app/Mail/TemplateEmail.php
@@ -124,7 +124,7 @@ class TemplateEmail extends Mailable
 
         /*In the hosted platform we need to slow things down a little for Storage to catch up.*/
 
-        if(Ninja::isHosted()){
+        if(Ninja::isHosted() && $this->invitation){
 
             $path = false;
 
diff --git a/app/Mail/VendorTemplateEmail.php b/app/Mail/VendorTemplateEmail.php
index 447114621ce0..5a9f7e6d2545 100644
--- a/app/Mail/VendorTemplateEmail.php
+++ b/app/Mail/VendorTemplateEmail.php
@@ -116,12 +116,7 @@ class VendorTemplateEmail extends Mailable
             })
             ->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()) {
-        //     sleep(1);
-        // }
-
-        if(Ninja::isHosted()){
+        if(Ninja::isHosted() && $this->invitation){
 
             $path = false;