diff --git a/src/frontend/src/contexts/index.tsx b/src/frontend/src/contexts/index.tsx
index 64142f942..acc7f4070 100644
--- a/src/frontend/src/contexts/index.tsx
+++ b/src/frontend/src/contexts/index.tsx
@@ -9,11 +9,13 @@ import { LocationProvider } from "./locationContext";
 import { TabsProvider } from "./tabsContext";
 import { TypesProvider } from "./typesContext";
 import { UndoRedoProvider } from "./undoRedoContext";
+import { BrowserRouter } from "react-router-dom";
 
 export default function ContextWrapper({ children }: { children: ReactNode }) {
   //element to wrap all context
   return (
     <>
+    <BrowserRouter>
       <AuthProvider>
         <TooltipProvider>
           <ReactFlowProvider>
@@ -33,6 +35,7 @@ export default function ContextWrapper({ children }: { children: ReactNode }) {
           </ReactFlowProvider>
         </TooltipProvider>
       </AuthProvider>
+      </BrowserRouter>
     </>
   );
 }
diff --git a/src/frontend/src/index.tsx b/src/frontend/src/index.tsx
index 2542f4903..db196080b 100644
--- a/src/frontend/src/index.tsx
+++ b/src/frontend/src/index.tsx
@@ -17,10 +17,8 @@ const root = ReactDOM.createRoot(
 );
 root.render(
   <ContextWrapper>
-    <BrowserRouter>
       <App />
       <ApiInterceptor />
-    </BrowserRouter>
   </ContextWrapper>
 );
 reportWebVitals();