diff --git a/frontend/src/Pages/ViewDebate.tsx b/frontend/src/Pages/ViewDebate.tsx
index b326d854..7ecc1fcf 100644
--- a/frontend/src/Pages/ViewDebate.tsx
+++ b/frontend/src/Pages/ViewDebate.tsx
@@ -81,7 +81,7 @@ export const ViewDebate: React.FC = () => {
     }
 
     const protocol = window.location.protocol === "https:" ? "wss:" : "ws:";
-    const apiUrl = import.meta.env.VITE_API_URL;
+    const apiUrl = import.meta.env.VITE_BASE_URL;
     let host = window.location.host;
     if (apiUrl) {
       try {
diff --git a/frontend/src/hooks/useDebateWS.ts b/frontend/src/hooks/useDebateWS.ts
index 64657fb9..d711d5d5 100644
--- a/frontend/src/hooks/useDebateWS.ts
+++ b/frontend/src/hooks/useDebateWS.ts
@@ -65,7 +65,7 @@ export const useDebateWS = (debateId: string | null) => {
 
     // Get WebSocket URL
     const protocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:';
-    const apiUrl = import.meta.env.VITE_API_URL;
+    const apiUrl = import.meta.env.VITE_BASE_URL;
     let host = window.location.host;
     if (apiUrl) {
       try {
diff --git a/frontend/src/services/notificationService.ts b/frontend/src/services/notificationService.ts
index bdebef12..131a0772 100644
--- a/frontend/src/services/notificationService.ts
+++ b/frontend/src/services/notificationService.ts
@@ -1,4 +1,4 @@
-const API_URL = import.meta.env.VITE_API_URL || 'http://localhost:1313';
+const API_URL = import.meta.env.VITE_BASE_URL || 'http://localhost:1313';
 
 export interface Notification {
   id: string;
diff --git a/frontend/src/services/teamService.ts b/frontend/src/services/teamService.ts
index b513b8dc..4e397aca 100644
--- a/frontend/src/services/teamService.ts
+++ b/frontend/src/services/teamService.ts
@@ -2,7 +2,7 @@ import { getAuthToken } from "@/utils/auth";
 
 // Team service for API calls
 const API_BASE_URL =
-  import.meta.env.VITE_API_URL?.replace(/\/+$/, "") ?? "http://localhost:1313";
+  import.meta.env.VITE_BASE_URL?.replace(/\/+$/, "") ?? "http://localhost:1313";
 
 export interface Team {
   id: string;