diff --git a/src/app/(main)/App.tsx b/src/app/(main)/App.tsx
index 7700639d..ec08838d 100644
--- a/src/app/(main)/App.tsx
+++ b/src/app/(main)/App.tsx
@@ -16,7 +16,7 @@ export function App({ children }) {
   }
 
   if (error) {
-    window.location.href = '/login';
+    window.location.href = `${process.env.basePath || ''}/login`;
     return null;
   }
 
diff --git a/src/app/logout/LogoutPage.tsx b/src/app/logout/LogoutPage.tsx
index bd471796..d66d62a9 100644
--- a/src/app/logout/LogoutPage.tsx
+++ b/src/app/logout/LogoutPage.tsx
@@ -13,7 +13,7 @@ export function LogoutPage() {
     async function logout() {
       await post('/auth/logout');
 
-      window.location.href = '/login';
+      window.location.href = `${process.env.basePath || ''}/login`;
     }
 
     removeClientAuthToken();