diff --git a/packages/client/src/main.tsx b/packages/client/src/main.tsx
index 27872b4..39c2b7a 100644
--- a/packages/client/src/main.tsx
+++ b/packages/client/src/main.tsx
@@ -4,7 +4,8 @@ import { createRoot } from "react-dom/client"
 import { RouterProvider, createRouter } from "@tanstack/react-router"
 import { routeTree } from "./routeTree.gen"
 
-const router = createRouter({ routeTree })
+const basepath = import.meta.env.BASE_URL.replace(/\/$/, "") || "/"
+const router = createRouter({ routeTree, basepath })
 
 declare module "@tanstack/react-router" {
 	interface Register {