diff --git a/apps/builder/sentry.server.config.ts b/apps/builder/sentry.server.config.ts
index b293dc89f..244946b18 100644
--- a/apps/builder/sentry.server.config.ts
+++ b/apps/builder/sentry.server.config.ts
@@ -21,6 +21,11 @@ Sentry.init({
         event.contexts?.trpc?.procedure_path === "typebot.importTypebot"
       )
         return null;
+      if (
+        exception.code === "CONFLICT" &&
+        event.contexts?.trpc?.procedure_path === "typebot.updateTypebot"
+      )
+        return null;
     }
     return event;
   },
diff --git a/apps/builder/src/features/editor/providers/TypebotProvider.tsx b/apps/builder/src/features/editor/providers/TypebotProvider.tsx
index 510e447a0..24d7c50db 100644
--- a/apps/builder/src/features/editor/providers/TypebotProvider.tsx
+++ b/apps/builder/src/features/editor/providers/TypebotProvider.tsx
@@ -156,11 +156,13 @@ export const TypebotProvider = ({
 
   const { mutateAsync: updateTypebot, isLoading: isSaving } =
     trpc.typebot.updateTypebot.useMutation({
-      onError: (error) =>
+      onError: (error) => {
+        if (error.data?.code === "CONFLICT") return;
         showToast({
           title: "Error while updating typebot",
           description: error.message,
-        }),
+        });
+      },
       onSuccess: () => {
         if (!typebotId) return;
         refetchTypebot();