diff --git a/apps/builder/src/features/graph/components/endpoints/SourceEndpoint.tsx b/apps/builder/src/features/graph/components/endpoints/SourceEndpoint.tsx
index 2b7fb32a2..e3aea7ee1 100644
--- a/apps/builder/src/features/graph/components/endpoints/SourceEndpoint.tsx
+++ b/apps/builder/src/features/graph/components/endpoints/SourceEndpoint.tsx
@@ -141,7 +141,8 @@ export const SourceEndpoint = ({
           borderWidth="3.5px"
           shadow={`sm`}
           borderColor={
-            previewingEdge?.from.blockId === source.blockId &&
+            previewingEdge &&
+            previewingEdge.from.blockId === source.blockId &&
             previewingEdge.from.itemId === source.itemId
               ? connectedColor
               : color
diff --git a/apps/builder/src/features/graph/components/nodes/item/ItemNode.tsx b/apps/builder/src/features/graph/components/nodes/item/ItemNode.tsx
index c80cdb8ac..42022a662 100644
--- a/apps/builder/src/features/graph/components/nodes/item/ItemNode.tsx
+++ b/apps/builder/src/features/graph/components/nodes/item/ItemNode.tsx
@@ -116,7 +116,10 @@ export const ItemNode = ({
               <SourceEndpoint
                 source={{
                   groupId: typebot.groups[indices.groupIndex].id,
-                  blockId: item.blockId,
+                  blockId:
+                    typebot.groups[indices.groupIndex].blocks[
+                      indices.blockIndex
+                    ].id,
                   itemId: item.id,
                 }}
                 pos="absolute"