diff --git a/workflow/engine/classes/model/map/TaskMapBuilder.php b/workflow/engine/classes/model/map/TaskMapBuilder.php
index 72293f230..f496fd1ad 100644
--- a/workflow/engine/classes/model/map/TaskMapBuilder.php
+++ b/workflow/engine/classes/model/map/TaskMapBuilder.php
@@ -181,7 +181,7 @@ class TaskMapBuilder
 
         $tMap->addColumn('TAS_AUTO_ROOT', 'TasAutoRoot', 'string', CreoleTypes::VARCHAR, true, 20);
 
-        $tMap->addColumn('TAS_RECEIVE_SERVER_UID', 'TasReceiveServerUid', 'string', CreoleTypes::VARCHAR, true, 32);
+        $tMap->addColumn('TAS_RECEIVE_SERVER_UID', 'TasReceiveServerUid', 'string', CreoleTypes::VARCHAR, false, 32);
 
         $tMap->addColumn('TAS_RECEIVE_LAST_EMAIL', 'TasReceiveLastEmail', 'string', CreoleTypes::VARCHAR, true, 20);
 
diff --git a/workflow/engine/config/schema.xml b/workflow/engine/config/schema.xml
index c5a8e3272..099191d69 100644
--- a/workflow/engine/config/schema.xml
+++ b/workflow/engine/config/schema.xml
@@ -1321,7 +1321,7 @@
     <column name="TAS_OFFLINE" type="VARCHAR" size="20" required="true" default="FALSE"/>
     <column name="TAS_EMAIL_SERVER_UID" type="VARCHAR" size="32" required="false" default=""/>
     <column name="TAS_AUTO_ROOT" type="VARCHAR" size="20" required="true" default="FALSE"/>
-    <column name="TAS_RECEIVE_SERVER_UID" type="VARCHAR" size="32" required="true" default=""/>
+    <column name="TAS_RECEIVE_SERVER_UID" type="VARCHAR" size="32" required="false" default=""/>
     <column name="TAS_RECEIVE_LAST_EMAIL" type="VARCHAR" size="20" required="true" default="FALSE"/>
     <column name="TAS_RECEIVE_EMAIL_FROM_FORMAT" type="INTEGER" default="0"/>
     <column name="TAS_RECEIVE_MESSAGE_TYPE" type="VARCHAR" size="20" required="true" default="text"/>
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Task.php b/workflow/engine/src/ProcessMaker/BusinessModel/Task.php
index 7ffdc648d..11540cf77 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Task.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Task.php
@@ -437,9 +437,7 @@ class Task
             }
 
             if ($arrayProperty["TAS_RECEIVE_LAST_EMAIL"] == "TRUE") {
-                if (empty($arrayProperty["TAS_RECEIVE_SERVER_UID"])) {
-                    throw (new \Exception("Invalid value specified for 'tas_receive_server_uid'"));
-                }
+
                 if (empty($arrayProperty["TAS_RECEIVE_SUBJECT_MESSAGE"])) {
                     throw (new \Exception("Invalid value specified for 'tas_receive_subject_message'"));
                 }