diff --git a/client/src/App.jsx b/client/src/App.jsx
index 61d9ac9..8ba9f40 100644
--- a/client/src/App.jsx
+++ b/client/src/App.jsx
@@ -16,7 +16,7 @@ function App() {
   return (
     <AuthProvider>
       <SocketProvider>
-        <Router>
+        <Router basename={process.env.NODE_ENV === 'production' ? '/drones' : ''}>
           <div className="App">
             <Toaster 
               position="top-right"