diff --git a/application/Espo/Services/Email.php b/application/Espo/Services/Email.php
index 48fa9e5132..4f934d0df8 100644
--- a/application/Espo/Services/Email.php
+++ b/application/Espo/Services/Email.php
@@ -198,8 +198,8 @@ class Email extends Record
         }
 
         if ($smtpParams) {
-            if ($emailAddress) {
-                $this->applySmtpHandler($this->getUser()->id, $emailAddress, $smtpParams);
+            if ($fromAddress) {
+                $this->applySmtpHandler($this->getUser()->id, $fromAddress, $smtpParams);
             }
             $emailSender->useSmtp($smtpParams);
         }