diff --git a/app/Mail/Engine/PaymentEmailEngine.php b/app/Mail/Engine/PaymentEmailEngine.php
index c6a3f46480..608eca23de 100644
--- a/app/Mail/Engine/PaymentEmailEngine.php
+++ b/app/Mail/Engine/PaymentEmailEngine.php
@@ -96,8 +96,12 @@ class PaymentEmailEngine extends BaseEmailEngine
 
                 $this->setAttachments([['file' => base64_encode($pdf), 'name' => $invoice->numberFormatter().'.pdf']]); 
 
-                foreach ($invoice->documents as $document) {
-                    $this->setAttachments([['path' => $document->filePath(), 'name' => $document->name, 'mime' => NULL, ]]);
+                //attach invoice documents also to payments
+                if ($this->client->getSetting('document_email_attachment') !== false)
+                {
+                    foreach ($invoice->documents as $document) {
+                        $this->setAttachments([['path' => $document->filePath(), 'name' => $document->name, 'mime' => NULL, ]]);
+                    }
                 }
 
             });