diff --git a/awx/main/scheduler/dag_workflow.py b/awx/main/scheduler/dag_workflow.py
index e7eaa5411e..4012be1421 100644
--- a/awx/main/scheduler/dag_workflow.py
+++ b/awx/main/scheduler/dag_workflow.py
@@ -210,36 +210,32 @@ class WorkflowDAG(SimpleDAG):
 
         for node in self.sort_nodes_topological():
             obj = node['node_object']
-
+            parent_nodes = [p['node_object'] for p in self.get_parents(obj)]
             if obj.do_not_run is False and not obj.job and node not in root_nodes and not obj.all_parents_must_converge:
-                parent_nodes = [p['node_object'] for p in self.get_parents(obj)]
                 if self._are_all_nodes_dnr_decided(parent_nodes):
                     if self._should_mark_node_dnr(node, parent_nodes):
                         obj.do_not_run = True
                         nodes_marked_do_not_run.append(node)
-            if obj.do_not_run is False and obj.all_parents_must_converge:
-                if self._are_relevant_parents_finished(node):
-                    # if the current node is a convergence node and all the 
-                    # parents are finished then check to see if all parents
-                    # met the needed criteria to run the convergence child
-                    # (i.e. parent must fail, parent must succeed)
-                    parent_nodes = [p['node_object'] for p in self.get_parents(obj)]
-                    if any(p.do_not_run for p in parent_nodes):
-                        obj.do_not_run = True
-                        nodes_marked_do_not_run.append(node)
-                    else:
-                        # import sdb
-                        # sdb.set_trace()
-                        for p in parent_nodes:
-                            child_nodes = []
-                            if p.job.status == "successful":
-                                child_nodes = [x for x in self.get_children(p, "success_nodes")]
-                            elif p.job.status == "failed":
-                                child_nodes = [x for x in self.get_children(p, "failure_nodes")]
-                            child_nodes.extend(x for x in self.get_children(p, "always_nodes"))
-                            if node not in child_nodes:
-                                obj.do_not_run = True
-                                nodes_marked_do_not_run.append(node)
-                                break 
+            if obj.do_not_run is False and obj.all_parents_must_converge and not obj.job:
+                if self._are_all_nodes_dnr_decided(parent_nodes):
+                    if self._are_relevant_parents_finished(node):
+                        # if the current node is a convergence node and all the 
+                        # parents are finished then check to see if all parents
+                        # met the needed criteria to run the convergence child
+                        # (i.e. parent must fail, parent must succeed)
+                        if any(p.do_not_run for p in parent_nodes):
+                            obj.do_not_run = True
+                            nodes_marked_do_not_run.append(node)
+                        else:
+                            for p in parent_nodes:
+                                if p.job.status == "successful":
+                                    status = "success_nodes"
+                                elif p.job.status == "failed":
+                                    status = "failure_nodes"
+                                if (p not in [node['node_object'] for node in self.get_parents(obj, status)]
+                                    and p not in [node['node_object'] for node in self.get_parents(obj, "always_nodes")]):
+                                    obj.do_not_run = True
+                                    nodes_marked_do_not_run.append(node)
+                                    break 
 
         return [n['node_object'] for n in nodes_marked_do_not_run]