diff --git a/frontend/chat-ui/src/api.js b/frontend/chat-ui/src/api.js
index e3d9a01..8cfb598 100644
--- a/frontend/chat-ui/src/api.js
+++ b/frontend/chat-ui/src/api.js
@@ -1,3 +1,4 @@
+export const API_BASE_URL = import.meta.env.VITE_API_BASE_URL || '';
 const API_BASE_URL = import.meta.env.VITE_API_BASE_URL || '';
 const API_KEY = import.meta.env.VITE_API_KEY || '';
 
diff --git a/frontend/chat-ui/src/components/ChatWindow.jsx b/frontend/chat-ui/src/components/ChatWindow.jsx
index e2c649e..fa9ba5a 100644
--- a/frontend/chat-ui/src/components/ChatWindow.jsx
+++ b/frontend/chat-ui/src/components/ChatWindow.jsx
@@ -1,6 +1,7 @@
 import React, { useEffect, useRef } from 'react';
 import { useStore } from '../store';
 import MessageBubble from './MessageBubble.jsx';
+import { API_BASE_URL } from '../api';
 
 export default function ChatWindow() {
   const { state, dispatch } = useStore();
@@ -12,7 +13,7 @@ export default function ChatWindow() {
 
   useEffect(() => {
     if (!state.currentConversation) return;
-    const events = new EventSource(`/stream/${state.currentConversation.id}`);
+    const events = new EventSource(`${API_BASE_URL}/stream/${state.currentConversation.id}`);
 
     const handleToken = (e) => {
       try {
diff --git a/frontend/chat-ui/src/components/InputBox.jsx b/frontend/chat-ui/src/components/InputBox.jsx
index b7a95e3..a8efc41 100644
--- a/frontend/chat-ui/src/components/InputBox.jsx
+++ b/frontend/chat-ui/src/components/InputBox.jsx
@@ -1,5 +1,6 @@
 import React, { useState, useRef } from 'react';
 import { useStore } from '../store';
+import { API_BASE_URL } from '../api';
 import { post } from '../api';
 
 export default function InputBox() {
diff --git a/frontend/chat-ui/src/components/MessageActions.jsx b/frontend/chat-ui/src/components/MessageActions.jsx
index 56c3cdd..b4c5bf0 100644
--- a/frontend/chat-ui/src/components/MessageActions.jsx
+++ b/frontend/chat-ui/src/components/MessageActions.jsx
@@ -1,7 +1,6 @@
 import React from 'react';
 import { useStore } from '../store';
-
-const API_BASE_URL = import.meta.env.VITE_API_BASE_URL || '';
+import { API_BASE_URL } from '../api';
 
 export default function MessageActions({ message }) {
   const { state } = useStore();
diff --git a/frontend/chat-ui/src/components/Sidebar.jsx b/frontend/chat-ui/src/components/Sidebar.jsx
index 5f640f9..e757dff 100644
--- a/frontend/chat-ui/src/components/Sidebar.jsx
+++ b/frontend/chat-ui/src/components/Sidebar.jsx
@@ -1,5 +1,6 @@
 import React, { useEffect } from 'react';
 import { useStore } from '../store';
+import { API_BASE_URL } from '../api';
 import { get, post } from '../api';
 
 export default function Sidebar() {
diff --git a/frontend/chat-ui/src/components/TopBar.jsx b/frontend/chat-ui/src/components/TopBar.jsx
index d9304bf..ff06c03 100644
--- a/frontend/chat-ui/src/components/TopBar.jsx
+++ b/frontend/chat-ui/src/components/TopBar.jsx
@@ -1,5 +1,6 @@
 import React, { useState, useEffect } from 'react';
 import { useStore } from '../store';
+import { API_BASE_URL } from '../api';
 
 export default function TopBar() {
   const { state, dispatch } = useStore();
@@ -15,7 +16,7 @@ export default function TopBar() {
     setTitle(t);
     if (!state.currentConversation) return;
     try {
-      await fetch(`/conversations/${state.currentConversation.id}`, {
+      await fetch(`${API_BASE_URL}/conversations/${state.currentConversation.id}`, {
         method: 'PUT',
         headers: {
           'Content-Type': 'application/json',
@@ -37,7 +38,7 @@ export default function TopBar() {
   const remove = async () => {
     if (!state.currentConversation) return;
     try {
-      await fetch(`/conversations/${state.currentConversation.id}`, {
+      await fetch(`${API_BASE_URL}/conversations/${state.currentConversation.id}`, {
         method: 'DELETE',
         headers: { 'x-api-key': import.meta.env.VITE_API_KEY },
       });