diff --git a/src/frontend/src/components/chatComponent/index.tsx b/src/frontend/src/components/chatComponent/index.tsx
index 829dd5b13..58c058866 100644
--- a/src/frontend/src/components/chatComponent/index.tsx
+++ b/src/frontend/src/components/chatComponent/index.tsx
@@ -72,7 +72,7 @@ export default function Chat({ flow }: ChatType) {
}
prevNodesRef.current = currentNodes;
- }, [tabsState]);
+ }, [tabsState, flow.id]);
return (
<>
@@ -83,9 +83,17 @@ export default function Chat({ flow }: ChatType) {
setIsBuilt={setIsBuilt}
isBuilt={isBuilt}
/>
- {isBuilt && canOpen && (
-
- )}
+ {isBuilt &&
+ tabsState[flow.id] &&
+ tabsState[flow.id].formKeysData &&
+ canOpen && (
+
+ )}