diff --git a/src/frontend/src/router.tsx b/src/frontend/src/router.tsx
index 314efd23a8..3ee7fb7843 100644
--- a/src/frontend/src/router.tsx
+++ b/src/frontend/src/router.tsx
@@ -1,5 +1,5 @@
 import { lazy } from 'react';
-import { createBrowserRouter } from 'react-router-dom';
+import { Route, Routes } from 'react-router-dom';
 
 import { Loadable } from './functions/loading';
 
@@ -58,100 +58,37 @@ export const Set_Password = Loadable(
 );
 
 // Routes
-export const router = createBrowserRouter(
-  [
-    {
-      path: '*',
-      element: <NotFound />,
-      errorElement: <ErrorPage />
-    },
-    {
-      path: '/',
-      element: <LayoutComponent />,
-      errorElement: <ErrorPage />,
-      children: [
-        {
-          index: true,
-          element: <Home />
-        },
-        {
-          path: 'home/',
-          element: <Home />
-        },
-        {
-          path: 'dashboard/',
-          element: <Dashboard />
-        },
-        {
-          path: 'notifications/',
-          element: <Notifications />
-        },
-        {
-          path: 'playground/',
-          element: <Playground />
-        },
-        {
-          path: 'scan',
-          element: <Scan />
-        },
-        {
-          path: 'part/',
-          element: <CategoryDetail />
-        },
-        {
-          path: 'part/category/:id',
-          element: <CategoryDetail />
-        },
-        {
-          path: 'part/:id',
-          element: <PartDetail />
-        },
-        {
-          path: 'stock/',
-          element: <LocationDetail />
-        },
-        {
-          path: 'stock/location/:id',
-          element: <LocationDetail />
-        },
-        {
-          path: 'stock/item/:id',
-          element: <StockDetail />
-        },
-        {
-          path: 'build/',
-          element: <BuildIndex />
-        },
-        {
-          path: 'build/:id',
-          element: <BuildDetail />
-        },
-        {
-          path: '/profile/:tabValue',
-          element: <Profile />
-        }
-      ]
-    },
-    {
-      path: '/login',
-      element: <Login />,
-      errorElement: <ErrorPage />
-    },
-    {
-      path: '/logged-in',
-      element: <Logged_In />,
-      errorElement: <ErrorPage />
-    },
-    {
-      path: '/reset-password',
-      element: <Reset />,
-      errorElement: <ErrorPage />
-    },
-    {
-      path: '/set-password',
-      element: <Set_Password />,
-      errorElement: <ErrorPage />
-    }
-  ],
-  { basename: '/platform' }
+export const routes = (
+  <Routes>
+    <Route path="*" element={<NotFound />} errorElement={<ErrorPage />} />
+    <Route path="/" element={<LayoutComponent />} errorElement={<ErrorPage />}>
+      <Route index element={<Home />} />,
+      <Route path="home/" element={<Home />} />,
+      <Route path="dashboard/" element={<Dashboard />} />,
+      <Route path="notifications/" element={<Notifications />} />,
+      <Route path="playground/" element={<Playground />} />,
+      <Route path="scan/" element={<Scan />} />,
+      <Route path="part/">
+        <Route index element={<CategoryDetail />} />
+        <Route path="category/:id" element={<CategoryDetail />} />
+        <Route path=":id/" element={<PartDetail />} />
+      </Route>
+      <Route path="stock/">
+        <Route index element={<LocationDetail />} />
+        <Route path="location/:id" element={<LocationDetail />} />
+        <Route path="item/:id/" element={<StockDetail />} />
+      </Route>
+      <Route path="build/">
+        <Route index element={<BuildIndex />} />
+        <Route path=":id/" element={<BuildDetail />} />
+      </Route>
+      <Route path="/profile/:tabValue" element={<Profile />} />
+    </Route>
+    <Route path="/" errorElement={<ErrorPage />}>
+      <Route path="/login" element={<Login />} />,
+      <Route path="/logged-in" element={<Logged_In />} />
+      <Route path="/reset-password" element={<Reset />} />
+      <Route path="/set-password" element={<Set_Password />} />
+    </Route>
+  </Routes>
 );
diff --git a/src/frontend/src/views/DesktopAppView.tsx b/src/frontend/src/views/DesktopAppView.tsx
index 5dd6a310bd..eb3027c3e8 100644
--- a/src/frontend/src/views/DesktopAppView.tsx
+++ b/src/frontend/src/views/DesktopAppView.tsx
@@ -1,11 +1,11 @@
 import { QueryClientProvider } from '@tanstack/react-query';
 import { useEffect, useState } from 'react';
-import { RouterProvider } from 'react-router-dom';
+import { BrowserRouter } from 'react-router-dom';
 
 import { queryClient, setApiDefaults } from '../App';
 import { BaseContext } from '../contexts/BaseContext';
 import { defaultHostList } from '../defaults/defaultHostList';
-import { router } from '../router';
+import { routes } from '../router';
 import { useApiState } from '../states/ApiState';
 import { useLocalState } from '../states/LocalState';
 import { useSessionState } from '../states/SessionState';
@@ -35,7 +35,7 @@ export default function DesktopAppView() {
   return (
     <BaseContext>
       <QueryClientProvider client={queryClient}>
-        <RouterProvider router={router} />
+        <BrowserRouter basename="platform">{routes}</BrowserRouter>
       </QueryClientProvider>
     </BaseContext>
   );