diff --git a/client/src/contexts/SocketContext.jsx b/client/src/contexts/SocketContext.jsx
index ed53412..9e78bbb 100644
--- a/client/src/contexts/SocketContext.jsx
+++ b/client/src/contexts/SocketContext.jsx
@@ -16,7 +16,7 @@ export const SocketProvider = ({ children }) => {
     if (isAuthenticated) {
       // Initialize socket connection
       const newSocket = io(process.env.NODE_ENV === 'production' 
-        ? window.location.origin 
+        ? window.location.origin + '/drones'
         : 'http://localhost:3001'
       );
 
diff --git a/client/src/services/api.js b/client/src/services/api.js
index 7d08d8f..dc5f846 100644
--- a/client/src/services/api.js
+++ b/client/src/services/api.js
@@ -1,7 +1,7 @@
 import axios from 'axios';
 
 const API_BASE_URL = process.env.NODE_ENV === 'production' 
-  ? '/api' 
+  ? '/drones/api' 
   : 'http://localhost:3001/api';
 
 const api = axios.create({