diff --git a/web/app/components/workflow/panel/debug-and-preview/hooks.ts b/web/app/components/workflow/panel/debug-and-preview/hooks.ts
index c23b73f874..89711b5d5e 100644
--- a/web/app/components/workflow/panel/debug-and-preview/hooks.ts
+++ b/web/app/components/workflow/panel/debug-and-preview/hooks.ts
@@ -371,11 +371,28 @@ export const useChat = (
           if (isInIteration) {
             const tracing = responseItem.workflowProcess!.tracing!
             const iterations = tracing[tracing.length - 1]
-            const currIteration = iterations.details![iterations.details!.length - 1]
-            currIteration[currIteration.length - 1] = {
-              ...data,
-              status: NodeRunningStatus.Succeeded,
-            } as any
+            if (iterations && iterations.details) {
+              const iterationIndex = data.execution_metadata?.iteration_index || 0
+              if (!iterations.details[iterationIndex])
+                iterations.details[iterationIndex] = []
+              const currIteration = iterations.details[iterationIndex]
+              const nodeIndex = currIteration.findIndex(node =>
+                node.node_id === data.node_id,
+              )
+              if (data.status === NodeRunningStatus.Succeeded) {
+                if (nodeIndex !== -1) {
+                  currIteration[nodeIndex] = {
+                    ...currIteration[nodeIndex],
+                    ...data,
+                  } as any
+                }
+                else {
+                  currIteration.push({
+                    ...data,
+                  } as any)
+                }
+              }
+            }
             handleUpdateChatList(produce(chatListRef.current, (draft) => {
               const currentIndex = draft.length - 1
               draft[currentIndex] = responseItem
diff --git a/web/app/components/workflow/run/node.tsx b/web/app/components/workflow/run/node.tsx
index aa8c96f387..2e45290ddf 100644
--- a/web/app/components/workflow/run/node.tsx
+++ b/web/app/components/workflow/run/node.tsx
@@ -63,6 +63,13 @@ const NodePanel: FC<Props> = ({
       return `${parseFloat((tokens / 1000000).toFixed(3))}M`
   }
 
+  const getCount = (iteration_curr_length: number | undefined, iteration_length: number) => {
+    if ((iteration_curr_length && iteration_curr_length < iteration_length) || !iteration_length)
+      return iteration_curr_length
+
+    return iteration_length
+  }
+
   useEffect(() => {
     setCollapseState(!nodeInfo.expand)
   }, [nodeInfo.expand, setCollapseState])
@@ -127,7 +134,7 @@ const NodePanel: FC<Props> = ({
                   onClick={handleOnShowIterationDetail}
                 >
                   <Iteration className='w-4 h-4 text-components-button-tertiary-text flex-shrink-0' />
-                  <div className='flex-1 text-left system-sm-medium text-components-button-tertiary-text'>{t('workflow.nodes.iteration.iteration', { count: nodeInfo.metadata?.iterator_index || nodeInfo.details?.length })}</div>
+                  <div className='flex-1 text-left system-sm-medium text-components-button-tertiary-text'>{t('workflow.nodes.iteration.iteration', { count: getCount(nodeInfo.details?.length, nodeInfo.metadata?.iterator_length) })}</div>
                   {justShowIterationNavArrow
                     ? (
                       <RiArrowRightSLine className='w-4 h-4 text-components-button-tertiary-text flex-shrink-0' />