diff --git a/apps/viewer/src/features/chat/api/continueChat.ts b/apps/viewer/src/features/chat/api/continueChat.ts
index 438073514..768a7374a 100644
--- a/apps/viewer/src/features/chat/api/continueChat.ts
+++ b/apps/viewer/src/features/chat/api/continueChat.ts
@@ -86,6 +86,9 @@ export const continueChat = publicProcedure
         logs,
         clientSideActions,
         visitedEdges,
+        hasCustomEmbedBubble: messages.some(
+          (message) => message.type === 'custom-embed'
+        ),
       })
 
     const isPreview = isNotDefined(session.state.typebotsQueue[0].resultId)
diff --git a/apps/viewer/src/features/chat/api/legacy/sendMessageV1.ts b/apps/viewer/src/features/chat/api/legacy/sendMessageV1.ts
index 4d7d7d590..1cec97cbb 100644
--- a/apps/viewer/src/features/chat/api/legacy/sendMessageV1.ts
+++ b/apps/viewer/src/features/chat/api/legacy/sendMessageV1.ts
@@ -133,6 +133,9 @@ export const sendMessageV1 = publicProcedure
               logs: allLogs,
               clientSideActions,
               visitedEdges,
+              hasCustomEmbedBubble: messages.some(
+                (message) => message.type === 'custom-embed'
+              ),
             })
 
         return {
@@ -187,6 +190,9 @@ export const sendMessageV1 = publicProcedure
             logs: allLogs,
             clientSideActions,
             visitedEdges,
+            hasCustomEmbedBubble: messages.some(
+              (message) => message.type === 'custom-embed'
+            ),
           })
 
         return {
diff --git a/apps/viewer/src/features/chat/api/legacy/sendMessageV2.ts b/apps/viewer/src/features/chat/api/legacy/sendMessageV2.ts
index 9d8655d4e..ca4c386a4 100644
--- a/apps/viewer/src/features/chat/api/legacy/sendMessageV2.ts
+++ b/apps/viewer/src/features/chat/api/legacy/sendMessageV2.ts
@@ -133,6 +133,9 @@ export const sendMessageV2 = publicProcedure
               logs: allLogs,
               clientSideActions,
               visitedEdges,
+              hasCustomEmbedBubble: messages.some(
+                (message) => message.type === 'custom-embed'
+              ),
             })
 
         return {
@@ -186,6 +189,9 @@ export const sendMessageV2 = publicProcedure
             logs: allLogs,
             clientSideActions,
             visitedEdges,
+            hasCustomEmbedBubble: messages.some(
+              (message) => message.type === 'custom-embed'
+            ),
           })
 
         return {
diff --git a/apps/viewer/src/features/chat/api/startChat.ts b/apps/viewer/src/features/chat/api/startChat.ts
index 084dafbe6..48a145de3 100644
--- a/apps/viewer/src/features/chat/api/startChat.ts
+++ b/apps/viewer/src/features/chat/api/startChat.ts
@@ -78,6 +78,9 @@ export const startChat = publicProcedure
             logs,
             clientSideActions,
             visitedEdges,
+            hasCustomEmbedBubble: messages.some(
+              (message) => message.type === 'custom-embed'
+            ),
           })
 
       return {
diff --git a/apps/viewer/src/features/chat/api/startChatPreview.ts b/apps/viewer/src/features/chat/api/startChatPreview.ts
index 70b877b89..d58cb8303 100644
--- a/apps/viewer/src/features/chat/api/startChatPreview.ts
+++ b/apps/viewer/src/features/chat/api/startChatPreview.ts
@@ -66,6 +66,9 @@ export const startChatPreview = publicProcedure
             logs,
             clientSideActions,
             visitedEdges,
+            hasCustomEmbedBubble: messages.some(
+              (message) => message.type === 'custom-embed'
+            ),
           })
 
       return {
diff --git a/packages/bot-engine/saveStateToDatabase.ts b/packages/bot-engine/saveStateToDatabase.ts
index 615106ffc..14f8556ce 100644
--- a/packages/bot-engine/saveStateToDatabase.ts
+++ b/packages/bot-engine/saveStateToDatabase.ts
@@ -16,6 +16,7 @@ type Props = {
   clientSideActions: ContinueChatResponse['clientSideActions']
   visitedEdges: VisitedEdge[]
   forceCreateSession?: boolean
+  hasCustomEmbedBubble?: boolean
 }
 
 export const saveStateToDatabase = async ({
@@ -25,12 +26,15 @@ export const saveStateToDatabase = async ({
   clientSideActions,
   forceCreateSession,
   visitedEdges,
+  hasCustomEmbedBubble,
 }: Props) => {
   const containsSetVariableClientSideAction = clientSideActions?.some(
     (action) => action.expectsDedicatedReply
   )
 
-  const isCompleted = Boolean(!input && !containsSetVariableClientSideAction)
+  const isCompleted = Boolean(
+    !input && !containsSetVariableClientSideAction && !hasCustomEmbedBubble
+  )
 
   const resultId = state.typebotsQueue[0].resultId
 
diff --git a/packages/embeds/js/src/features/blocks/bubbles/embed/components/CustomEmbedBubble.tsx b/packages/embeds/js/src/features/blocks/bubbles/embed/components/CustomEmbedBubble.tsx
index 4b53ebea4..af5635f3d 100644
--- a/packages/embeds/js/src/features/blocks/bubbles/embed/components/CustomEmbedBubble.tsx
+++ b/packages/embeds/js/src/features/blocks/bubbles/embed/components/CustomEmbedBubble.tsx
@@ -21,10 +21,6 @@ export const CustomEmbedBubble = (props: Props) => {
   let containerRef: HTMLDivElement | undefined
 
   onMount(() => {
-    console.log(
-      props.content.initFunction.content,
-      props.content.initFunction.args
-    )
     executeCode({
       args: {
         ...props.content.initFunction.args,