diff --git a/apps/viewer/src/pages/api/v1/workspaces/[workspaceId]/whatsapp/[credentialsId]/webhook.ts b/apps/viewer/src/pages/api/v1/workspaces/[workspaceId]/whatsapp/[credentialsId]/webhook.ts
index fea04c2f9..7389b7d57 100644
--- a/apps/viewer/src/pages/api/v1/workspaces/[workspaceId]/whatsapp/[credentialsId]/webhook.ts
+++ b/apps/viewer/src/pages/api/v1/workspaces/[workspaceId]/whatsapp/[credentialsId]/webhook.ts
@@ -88,17 +88,22 @@ const processWhatsAppReply = async ({
   if (!phoneNumberId) return { message: 'No phone number id found' }
   console.log('Received message:', receivedMessage)
   console.log('sessionId', `wa-${phoneNumberId}-${receivedMessage.from}`)
-  const { message } = await resumeWhatsAppFlow({
-    receivedMessage,
-    sessionId: `wa-${phoneNumberId}-${receivedMessage.from}`,
-    phoneNumberId,
-    credentialsId,
-    workspaceId,
-    contact: {
-      name: contactName,
-      phoneNumber: contactPhoneNumber,
-    },
-  })
-  console.log('Message:', message)
-  return { message }
+  try {
+    const { message } = await resumeWhatsAppFlow({
+      receivedMessage,
+      sessionId: `wa-${phoneNumberId}-${receivedMessage.from}`,
+      phoneNumberId,
+      credentialsId,
+      workspaceId,
+      contact: {
+        name: contactName,
+        phoneNumber: contactPhoneNumber,
+      },
+    })
+    console.log('Message:', message)
+    return { message }
+  } catch (err) {
+    console.error('Error:', err)
+    return { message: 'Error processing message' }
+  }
 }