diff --git a/src/App.jsx b/src/App.jsx
index 371d490..b65f65b 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -990,7 +990,7 @@ function App() {
             <TasksSettingsProvider>
               <TaskMasterProvider>
                 <ProtectedRoute>
-                  <Router>
+                  <Router basename={window.__ROUTER_BASENAME__ || ''}>                                                                                                      
                     <Routes>
                       <Route path="/" element={<AppContent />} />
                       <Route path="/session/:sessionId" element={<AppContent />} />