diff --git a/pkg/apis/workflow/v1alpha1/workflow_phase.go b/pkg/apis/workflow/v1alpha1/workflow_phase.go
index 86f2416a001d..8e8d2bae26e0 100644
--- a/pkg/apis/workflow/v1alpha1/workflow_phase.go
+++ b/pkg/apis/workflow/v1alpha1/workflow_phase.go
@@ -23,8 +23,5 @@ func (p WorkflowPhase) Completed() bool {
 }
 
 func (p WorkflowPhase) Canceled() bool {
-	if p == WorkflowCanceled {
-		return true
-	}
-	return false
+	return p == WorkflowCanceled
 }
diff --git a/workflow/controller/dag.go b/workflow/controller/dag.go
index c2792fe0f948..8dc9a6900caf 100644
--- a/workflow/controller/dag.go
+++ b/workflow/controller/dag.go
@@ -145,6 +145,8 @@ func (d *dagContext) assessDAGPhase(targetTasks []string, nodes wfv1.Nodes, isSh
 	for _, task := range targetTasks {
 		targetTaskPhases[d.taskNodeID(task)] = ""
 	}
+	// record target task hooks whether Completed
+	targetTaskHooksCompleted := make(map[string]bool)
 
 	boundaryNode, err := nodes.Get(d.boundaryID)
 	if err != nil {
@@ -168,9 +170,12 @@ func (d *dagContext) assessDAGPhase(targetTasks []string, nodes wfv1.Nodes, isSh
 			branchPhase = wfv1.NodeRunning
 		}
 
-		// Only overwrite the branchPhase if this node completed. (If it didn't we can just inherit our parent's branchPhase).
 		if node.Completed() {
 			branchPhase = node.Phase
+			if _, ok := targetTaskHooksCompleted[node.ID]; ok {
+				// if this node is hook, then record it Completed
+				targetTaskHooksCompleted[node.ID] = true
+			}
 		}
 
 		// This node is a target task, so it will not have any children. Store or deduce its phase
@@ -182,6 +187,11 @@ func (d *dagContext) assessDAGPhase(targetTasks []string, nodes wfv1.Nodes, isSh
 			if !previousPhase.FailedOrError() {
 				targetTaskPhases[node.ID] = branchPhase
 			}
+
+			// add hooks
+			for _, hook := range node.Children {
+				targetTaskHooksCompleted[hook] = false
+			}
 		}
 
 		if node.Type == wfv1.NodeTypeRetry {
@@ -218,6 +228,16 @@ func (d *dagContext) assessDAGPhase(targetTasks []string, nodes wfv1.Nodes, isSh
 		}
 	}
 
+	// if fail or error, then check all target task hooks Completed, if not then let workflow run
+	if result.FailedOrError() {
+		for _, hookCompleted := range targetTaskHooksCompleted {
+			if !hookCompleted {
+				result = wfv1.NodeRunning
+				return result, nil
+			}
+		}
+	}
+
 	return result, nil
 }