diff --git a/web/app/components/workflow/custom-edge.tsx b/web/app/components/workflow/custom-edge.tsx
index 7da3a6869b..73fc0c8880 100644
--- a/web/app/components/workflow/custom-edge.tsx
+++ b/web/app/components/workflow/custom-edge.tsx
@@ -23,6 +23,7 @@ const CustomEdge = ({
     targetX,
     targetY,
     borderRadius: 30,
+    offset: -20,
   })
 
   return (
diff --git a/web/app/components/workflow/nodes/_base/node.tsx b/web/app/components/workflow/nodes/_base/node.tsx
index 2c803dc0c1..a348fd29c3 100644
--- a/web/app/components/workflow/nodes/_base/node.tsx
+++ b/web/app/components/workflow/nodes/_base/node.tsx
@@ -2,8 +2,11 @@ import type {
   FC,
   ReactNode,
 } from 'react'
-import { memo } from 'react'
-import { useNodeId } from 'reactflow'
+import { memo, useMemo } from 'react'
+import {
+  getOutgoers,
+  useNodeId,
+} from 'reactflow'
 import { useWorkflowContext } from '../../context'
 import { Plus } from '@/app/components/base/icons/src/vender/line/general'
 
@@ -16,9 +19,17 @@ const BaseNode: FC<BaseNodeProps> = ({
 }) => {
   const nodeId = useNodeId()
   const {
+    nodes,
+    edges,
     selectedNodeId,
     handleSelectedNodeIdChange,
   } = useWorkflowContext()
+  const currentNode = useMemo(() => {
+    return nodes.find(node => node.id === nodeId)
+  }, [nodeId, nodes])
+  const outgoers = useMemo(() => {
+    return getOutgoers(currentNode!, nodes, edges)
+  }, [currentNode, nodes, edges])
 
   return (
     <div
@@ -39,8 +50,9 @@ const BaseNode: FC<BaseNodeProps> = ({
       </div>
       <div
         className={`
-          hidden absolute -bottom-2 left-1/2 -translate-x-1/2 group-hover:flex items-center justify-center 
+          hidden absolute -bottom-2 left-1/2 -translate-x-1/2 items-center justify-center 
           w-4 h-4 rounded-full bg-primary-600 cursor-pointer z-10
+          ${!outgoers.length && 'group-hover:flex'}
         `}
       >
         <Plus className='w-2.5 h-2.5 text-white' />
diff --git a/web/app/components/workflow/nodes/index.tsx b/web/app/components/workflow/nodes/index.tsx
index 5e2bacfd34..d43cd93806 100644
--- a/web/app/components/workflow/nodes/index.tsx
+++ b/web/app/components/workflow/nodes/index.tsx
@@ -1,8 +1,8 @@
 import { memo } from 'react'
+import type { NodeProps } from 'reactflow'
 import {
   Handle,
   Position,
-  useNodeId,
 } from 'reactflow'
 import { useWorkflowContext } from '../context'
 import {
@@ -10,11 +10,10 @@ import {
   PanelMap,
 } from './constants'
 
-const CustomNode = () => {
-  const nodeId = useNodeId()
-  const { nodes } = useWorkflowContext()
-  const currentNode = nodes.find(node => node.id === nodeId)
-  const NodeComponent = NodeMap[currentNode!.data.type as string]
+const CustomNode = ({
+  data,
+}: NodeProps) => {
+  const NodeComponent = NodeMap[data.type]
 
   return (
     <>