diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/Flow/Flow.tsx b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/Flow/Flow.tsx
index 3a55fabf1d..d99307df2d 100644
--- a/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/Flow/Flow.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/FlowEditor/Flow/Flow.tsx
@@ -1,5 +1,6 @@
 import { useGetV1GetSpecificGraph } from "@/app/api/__generated__/endpoints/graphs/graphs";
 import { okData } from "@/app/api/helpers";
+import { ErrorBoundary } from "@/components/molecules/ErrorBoundary/ErrorBoundary";
 import { FloatingReviewsPanel } from "@/components/organisms/FloatingReviewsPanel/FloatingReviewsPanel";
 import { BuilderChatPanel } from "../../BuilderChatPanel/BuilderChatPanel";
 import { Flag, useGetFlag } from "@/services/feature-flags/use-get-flag";
@@ -139,10 +140,12 @@ export const Flow = () => {
         graphId={flowID || undefined}
       />
       {isBuilderChatEnabled && (
-        <BuilderChatPanel
-          isGraphLoaded={isInitialLoadComplete}
-          onGraphEdited={() => void refetchGraph()}
-        />
+        <ErrorBoundary context="BuilderChatPanel" fallback={null}>
+          <BuilderChatPanel
+            isGraphLoaded={isInitialLoadComplete}
+            onGraphEdited={() => void refetchGraph()}
+          />
+        </ErrorBoundary>
       )}
     </div>
   );