diff --git a/app/Services/Email/EmailDefaults.php b/app/Services/Email/EmailDefaults.php
index 7ac53f20731a..476ab592cdd8 100644
--- a/app/Services/Email/EmailDefaults.php
+++ b/app/Services/Email/EmailDefaults.php
@@ -296,7 +296,7 @@ class EmailDefaults
         }
 
         /** UBL xml file */
-        if ($this->email->email_object->entity instanceof Invoice && $this->email->email_object->settings->ubl_email_attachment) {
+        if ($this->email->email_object->settings->ubl_email_attachment && $this->email->email_object->entity instanceof Invoice) {
             $ubl_string = (new CreateUbl($this->email->email_object->entity))->handle();
 
             if ($ubl_string) {
@@ -307,7 +307,6 @@ class EmailDefaults
         if(!$this->email->email_object->settings->document_email_attachment)
             return $this;
 
-
         /* Company Documents */
         $this->email->email_object->documents = array_merge($this->email->email_object->documents, $this->email->company->documents->pluck('id')->toArray());