diff --git a/space_flow/src/App.tsx b/space_flow/src/App.tsx
index bd55a4fb9..634e63318 100644
--- a/space_flow/src/App.tsx
+++ b/space_flow/src/App.tsx
@@ -98,7 +98,7 @@ export default function App() {
   return (
     //need parent component with width and height
     <div className="h-full flex flex-col">
-      <ReactFlowProvider>
+      
         <div className="flex grow-0 shrink basis-auto">
           <Header userNavigation={userNavigation} user={user}></Header>
         </div>
@@ -146,7 +146,6 @@ export default function App() {
             </div>
           ))}
         </div>
-      </ReactFlowProvider>
     </div>
   );
 }
diff --git a/space_flow/src/pages/FlowPage/index.tsx b/space_flow/src/pages/FlowPage/index.tsx
index 4e4923a98..deea5efb7 100644
--- a/space_flow/src/pages/FlowPage/index.tsx
+++ b/space_flow/src/pages/FlowPage/index.tsx
@@ -5,6 +5,7 @@ import ReactFlow, {
   addEdge,
   useEdgesState,
   useNodesState,
+  ReactFlowProvider,
 } from "reactflow";
 import { locationContext } from "../../contexts/locationContext";
 import ExtraSidebar from "./components/extraSidebarComponent";
@@ -128,6 +129,7 @@ export default function FlowPage() {
 
   return (
     <div className="w-full h-full" ref={reactFlowWrapper}>
+      <ReactFlowProvider>
       <ReactFlow
         nodes={nodes}
         edges={edges}
@@ -144,6 +146,7 @@ export default function FlowPage() {
         <Controls ></Controls>
       </ReactFlow>
       <Chat reactFlowInstance={reactFlowInstance} />
+      </ReactFlowProvider>
     </div>
   );
 }