diff --git a/workflow/engine/src/ProcessMaker/Core/RoutingScreen.php b/workflow/engine/src/ProcessMaker/Core/RoutingScreen.php
index dafe61a98..cce646e47 100644
--- a/workflow/engine/src/ProcessMaker/Core/RoutingScreen.php
+++ b/workflow/engine/src/ProcessMaker/Core/RoutingScreen.php
@@ -109,7 +109,13 @@ class RoutingScreen extends \Derivation
                     }
                 }
                 if ($delete) {
-                    unset($response[$index]);
+                    $thereIsNoTask = true;
+                    if ($response[$index]["NEXT_TASK"]["TAS_UID"] === "-1") {
+                        $thereIsNoTask = false;
+                    }
+                    if ($thereIsNoTask === true) {
+                        unset($response[$index]);
+                    }
                 }
             }
         }