diff --git a/workflow/engine/classes/SpoolRun.php b/workflow/engine/classes/SpoolRun.php
index d212f075a..255aeda04 100644
--- a/workflow/engine/classes/SpoolRun.php
+++ b/workflow/engine/classes/SpoolRun.php
@@ -411,6 +411,8 @@ class SpoolRun
                                 }
                                 break;
                         }
+                        $systemConfiguration = System::getSystemConfiguration();
+                        $oPHPMailer->Timeout = is_numeric($systemConfiguration['smtp_timeout']) ? $systemConfiguration['smtp_timeout'] : 20;
                         $oPHPMailer->CharSet = "UTF-8";
                         $oPHPMailer->Encoding = "8bit";
                         $oPHPMailer->Host = $this->config['MESS_SERVER'];
diff --git a/workflow/engine/src/ProcessMaker/Core/System.php b/workflow/engine/src/ProcessMaker/Core/System.php
index df1a037dc..890264c0c 100644
--- a/workflow/engine/src/ProcessMaker/Core/System.php
+++ b/workflow/engine/src/ProcessMaker/Core/System.php
@@ -63,7 +63,8 @@ class System
         'disable_download_documents_session_validation' => 0,
         'logs_max_files' => 60,
         'logs_location' => '',
-        'logging_level' => 'INFO'
+        'logging_level' => 'INFO',
+        'smtp_timeout' => 20
     );
 
     /**