diff --git a/apps/viewer/next.config.js b/apps/viewer/next.config.js
index 6627a0d2b..72eec35ab 100644
--- a/apps/viewer/next.config.js
+++ b/apps/viewer/next.config.js
@@ -8,7 +8,6 @@ const nextConfig = {
     '@typebot.io/lib',
     '@typebot.io/schemas',
     '@typebot.io/emails',
-    'bot-engine',
   ],
   output: 'standalone',
   experimental: {
diff --git a/apps/viewer/src/features/blocks/integrations/openai/createChatCompletionOpenAI.ts b/apps/viewer/src/features/blocks/integrations/openai/createChatCompletionOpenAI.ts
index 3b3292e1f..e4407f2cd 100644
--- a/apps/viewer/src/features/blocks/integrations/openai/createChatCompletionOpenAI.ts
+++ b/apps/viewer/src/features/blocks/integrations/openai/createChatCompletionOpenAI.ts
@@ -16,7 +16,7 @@ import { isDefined, byId, isNotEmpty } from '@typebot.io/lib'
 import { decrypt } from '@typebot.io/lib/api/encryption'
 import { saveErrorLog } from '@/features/logs/saveErrorLog'
 import { updateVariables } from '@/features/variables/updateVariables'
-import { parseVariables } from 'bot-engine'
+import { parseVariables } from '@/features/variables/parseVariables'
 
 export const createChatCompletionOpenAI = async (
   state: SessionState,
diff --git a/apps/viewer/src/features/blocks/integrations/webhook/executeWebhookBlock.ts b/apps/viewer/src/features/blocks/integrations/webhook/executeWebhookBlock.ts
index 7503efe4d..3ba30aee8 100644
--- a/apps/viewer/src/features/blocks/integrations/webhook/executeWebhookBlock.ts
+++ b/apps/viewer/src/features/blocks/integrations/webhook/executeWebhookBlock.ts
@@ -27,7 +27,7 @@ import { ExecuteIntegrationResponse } from '@/features/chat/types'
 import { saveErrorLog } from '@/features/logs/saveErrorLog'
 import { saveSuccessLog } from '@/features/logs/saveSuccessLog'
 import { updateVariables } from '@/features/variables/updateVariables'
-import { parseVariables } from 'bot-engine'
+import { parseVariables } from '@/features/variables/parseVariables'
 
 export const executeWebhookBlock = async (
   state: SessionState,
diff --git a/apps/viewer/src/features/blocks/logic/condition/executeCondition.ts b/apps/viewer/src/features/blocks/logic/condition/executeCondition.ts
index 44dea97ce..4af513c0e 100644
--- a/apps/viewer/src/features/blocks/logic/condition/executeCondition.ts
+++ b/apps/viewer/src/features/blocks/logic/condition/executeCondition.ts
@@ -9,7 +9,7 @@ import {
 import { isNotDefined, isDefined } from '@typebot.io/lib'
 import { ExecuteLogicResponse } from '@/features/chat/types'
 import { findUniqueVariableValue } from '@/features/variables/findUniqueVariableValue'
-import { parseVariables } from 'bot-engine'
+import { parseVariables } from '@/features/variables/parseVariables'
 
 export const executeCondition = (
   { typebot: { variables } }: SessionState,