diff --git a/space_flow/src/components/chatComponent/index.tsx b/space_flow/src/components/chatComponent/index.tsx
index f5e09213a..446bf9b61 100644
--- a/space_flow/src/components/chatComponent/index.tsx
+++ b/space_flow/src/components/chatComponent/index.tsx
@@ -34,7 +34,7 @@ export default function Chat({ reactFlowInstance }) {
     return true;
   }
   function validateChatNodes(){
-    if(!reactFlowInstance.getNodes().some((n)=> (n.type === 'chatOutputNode')) || !reactFlowInstance.getNodes().some((n)=> (n.type === 'chatInputNode'))){
+    if(!reactFlowInstance.getNodes().some((n)=> (n.type === 'chatOutputNode'))){
       return false;
     }
     return true;
@@ -108,11 +108,7 @@ export default function Chat({ reactFlowInstance }) {
                             let message = chatValue;
                             setChatValue("");
                             addChatHistory(message, true);
-                            sendAll({
-                              message,
-                              nodes: JSON.stringify(reactFlowInstance.getNodes()),
-                              edges: JSON.stringify(reactFlowInstance.getEdges()),
-                            }).then((r) => {addChatHistory(r.data.messsage, false);});
+                            sendAll({...reactFlowInstance.toObject(),message}).then((r) => {addChatHistory(r.data.messsage, false);});
                           } else {
                             setErrorData({title: 'Error sending message', list:['Chat nodes are missing.']})
                           }
diff --git a/space_flow/src/pages/FlowPage/index.tsx b/space_flow/src/pages/FlowPage/index.tsx
index 7bce6b89c..e715460e9 100644
--- a/space_flow/src/pages/FlowPage/index.tsx
+++ b/space_flow/src/pages/FlowPage/index.tsx
@@ -50,6 +50,7 @@ export default function FlowPage({ flow }) {
   const [edges, setEdges, onEdgesChange] = useEdgesState(
     flow.data?.edges ?? []
   );
+  const {setViewport} = useReactFlow()
 
   useEffect(() => {
     if (reactFlowInstance && flow) {
@@ -62,7 +63,7 @@ export default function FlowPage({ flow }) {
     setNodes(flow?.data?.nodes ?? []);
     setEdges(flow?.data?.edges ?? []);
     if (reactFlowInstance) {
-      reactFlowInstance.setViewport(
+      setViewport(
         flow?.data?.viewport ?? { x: 1, y: 0, zoom: 1 }
       );
     }