diff --git a/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php b/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php
index 09d3d61cf..44cbcd12f 100755
--- a/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php
+++ b/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php
@@ -233,6 +233,16 @@ class BpmnWorkflow extends Project\Bpmn
             $taskData["TAS_ASSIGN_TYPE"] = "BALANCED";
         }
 
+        if ($activityBefore->getActTaskType() == "SCRIPTTASK" && $activityCurrent->getActTaskType() == "SCRIPTTASK") {
+            $taskData["TAS_TYPE"] = "SCRIPT-TASK";
+            $taskData["TAS_ASSIGN_TYPE"] = "BALANCED";
+        }
+
+        if ($activityBefore->getActTaskType() == "EMPTY" && $activityCurrent->getActTaskType() == "EMPTY") {
+            $taskData["TAS_TYPE"] = "NORMAL";
+            $taskData["TAS_ASSIGN_TYPE"] = "BALANCED";
+        }
+
         if ($activityBefore->getActTaskType() == "SCRIPTTASK" && $activityCurrent->getActTaskType() != "SCRIPTTASK") {
             $taskData["TAS_TYPE"] = "NORMAL";
             $taskData["TAS_ASSIGN_TYPE"] = "BALANCED";