diff --git a/workflow/engine/classes/class.actionsByEmailCore.php b/workflow/engine/classes/class.actionsByEmailCore.php
index 80a78f621..0e769ac0c 100644
--- a/workflow/engine/classes/class.actionsByEmailCore.php
+++ b/workflow/engine/classes/class.actionsByEmailCore.php
@@ -80,7 +80,7 @@ class actionsByEmailCoreClass extends PMPlugin
 
             $emailServer = new \ProcessMaker\BusinessModel\EmailServer();
 
-            $emailSetup = ($dataAbe['ABE_EMAIL_SERVER_UID'] != '') ?
+            $emailSetup = (!is_null(\EmailServerPeer::retrieveByPK($dataAbe['ABE_EMAIL_SERVER_UID']))) ?
                 $emailServer->getEmailServer($dataAbe['ABE_EMAIL_SERVER_UID'], true) :
                 $emailServer->getEmailServerDefault();