diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterExecThread.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterExecThread.java
index db53d00033..e8c9833e0e 100644
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterExecThread.java
+++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterExecThread.java
@@ -312,11 +312,12 @@ public class MasterExecThread implements Runnable {
      * @throws Exception exception
      */
     private void prepareProcess() throws Exception {
-        // init task queue
-        initTaskQueue();
 
         // gen process dag
         buildFlowDag();
+
+        // init task queue
+        initTaskQueue();
         logger.info("prepare process :{} end", processInstance.getId());
     }
 
@@ -371,6 +372,9 @@ public class MasterExecThread implements Runnable {
             if(task.isTaskComplete()){
                 completeTaskList.put(task.getName(), task);
             }
+            if(task.isConditionsTask() || DagHelper.haveConditionsAfterNode(task.getName(), dag)){
+                continue;
+            }
             if(task.getState().typeIsFailure() && !task.taskCanRetry()){
                 errorTaskList.put(task.getName(), task);
             }