diff --git a/apps/builder/src/features/editor/providers/TypebotProvider/actions/blocks.ts b/apps/builder/src/features/editor/providers/TypebotProvider/actions/blocks.ts
index faf17fbde..a9f002260 100644
--- a/apps/builder/src/features/editor/providers/TypebotProvider/actions/blocks.ts
+++ b/apps/builder/src/features/editor/providers/TypebotProvider/actions/blocks.ts
@@ -130,6 +130,11 @@ const moveBlockToGroup = (
         : (newBlock.outgoingEdgeId = undefined)
     }
   }
+  typebot.edges.forEach((edge) => {
+    if (edge.to.blockId === block.id) {
+      edge.to.groupId = groupId
+    }
+  })
   typebot.groups[groupIndex].blocks.splice(blockIndex ?? 0, 0, newBlock)
 }
 
diff --git a/apps/builder/src/lib/prisma.ts b/apps/builder/src/lib/prisma.ts
index 09bb51dc7..7fab529e3 100644
--- a/apps/builder/src/lib/prisma.ts
+++ b/apps/builder/src/lib/prisma.ts
@@ -2,7 +2,7 @@
  * Instantiates a single instance PrismaClient and save it on the global object.
  * @link https://www.prisma.io/docs/support/help-articles/nextjs-prisma-client-dev-practices
  */
-import { PrismaClient } from '@prisma/client'
+import { PrismaClient } from 'db'
 
 const prismaGlobal = global as typeof global & {
   prisma?: PrismaClient
diff --git a/packages/bot-engine/src/components/ConversationContainer.tsx b/packages/bot-engine/src/components/ConversationContainer.tsx
index 474b29f20..015f4f454 100644
--- a/packages/bot-engine/src/components/ConversationContainer.tsx
+++ b/packages/bot-engine/src/components/ConversationContainer.tsx
@@ -78,7 +78,10 @@ export const ConversationContainer = ({
     onNewGroupVisible(nextEdge)
     setDisplayedGroups([
       ...displayedGroups,
-      { group: nextGroup, startBlockIndex },
+      {
+        group: nextGroup,
+        startBlockIndex: startBlockIndex === -1 ? 0 : startBlockIndex,
+      },
     ])
   }