diff --git a/packages/workflow-dashboard/src/components/workflow-graph/role-node.tsx b/packages/workflow-dashboard/src/components/workflow-graph/role-node.tsx
index 1f221ae..a737877 100644
--- a/packages/workflow-dashboard/src/components/workflow-graph/role-node.tsx
+++ b/packages/workflow-dashboard/src/components/workflow-graph/role-node.tsx
@@ -45,7 +45,7 @@ export function RoleNode(props: NodeProps) {
       }}
       title={data.description}
     >
-      <Handle type="target" position={Position.Top} style={handleStyle} isConnectable={false} />
+      <Handle type="target" position={Position.Top} id="top-in" style={handleStyle} isConnectable={false} />
       <Handle type="target" position={Position.Left} id="left-in" style={handleStyle} isConnectable={false} />
       <Handle type="target" position={Position.Right} id="right-in" style={handleStyle} isConnectable={false} />
       <Handle type="source" position={Position.Left} id="left-out" style={handleStyle} isConnectable={false} />
@@ -67,7 +67,7 @@ export function RoleNode(props: NodeProps) {
           {data.description}
         </div>
       )}
-      <Handle type="source" position={Position.Bottom} style={handleStyle} isConnectable={false} />
+      <Handle type="source" position={Position.Bottom} id="bottom-out" style={handleStyle} isConnectable={false} />
     </div>
   );
 }
diff --git a/packages/workflow-dashboard/src/components/workflow-graph/terminal-node.tsx b/packages/workflow-dashboard/src/components/workflow-graph/terminal-node.tsx
index 4adea67..8a1685c 100644
--- a/packages/workflow-dashboard/src/components/workflow-graph/terminal-node.tsx
+++ b/packages/workflow-dashboard/src/components/workflow-graph/terminal-node.tsx
@@ -45,11 +45,12 @@ export function TerminalNode(props: NodeProps) {
         <Handle
           type="source"
           position={Position.Bottom}
+          id="bottom-out"
           style={handleStyle}
           isConnectable={false}
         />
       ) : (
-        <Handle type="target" position={Position.Top} style={handleStyle} isConnectable={false} />
+        <Handle type="target" position={Position.Top} id="top-in" style={handleStyle} isConnectable={false} />
       )}
       {isStart ? "▶" : "■"}
     </div>
diff --git a/packages/workflow-dashboard/src/components/workflow-graph/use-layout.ts b/packages/workflow-dashboard/src/components/workflow-graph/use-layout.ts
index 2d235c3..aacbeb9 100644
--- a/packages/workflow-dashboard/src/components/workflow-graph/use-layout.ts
+++ b/packages/workflow-dashboard/src/components/workflow-graph/use-layout.ts
@@ -216,8 +216,8 @@ function computeLayout(input: LayoutInput): LayoutResult {
       id: edgeKey(e),
       source: e.from,
       target: e.to,
-      sourceHandle: isFeedback ? (feedbackSide === "left" ? "left-out" : "right-out") : undefined,
-      targetHandle: isFeedback ? (feedbackSide === "left" ? "left-in" : "right-in") : undefined,
+      sourceHandle: isFeedback ? (feedbackSide === "left" ? "left-out" : "right-out") : "bottom-out",
+      targetHandle: isFeedback ? (feedbackSide === "left" ? "left-in" : "right-in") : "top-in",
       type: "condition",
       data: {
         condition: e.condition,