diff --git a/ui/components/ChatWindow.tsx b/ui/components/ChatWindow.tsx
index b3d0089..3d00cb2 100644
--- a/ui/components/ChatWindow.tsx
+++ b/ui/components/ChatWindow.tsx
@@ -130,6 +130,7 @@ const useSocket = (
 
           if (
             embeddingModelProvider &&
+            embeddingModelProvider != 'custom_openai' &&
             !embeddingModelProviders[embeddingModelProvider][embeddingModel]
           ) {
             embeddingModel = Object.keys(
@@ -159,6 +160,17 @@ const useSocket = (
         searchParams.append('embeddingModel', embeddingModel!);
         searchParams.append('embeddingModelProvider', embeddingModelProvider);
 
+        if (embeddingModelProvider === 'custom_openai') {
+          searchParams.append(
+            'openAIApiKey',
+            localStorage.getItem('openAIApiKey')!,
+          );
+          searchParams.append(
+            'openAIBaseURL',
+            localStorage.getItem('openAIBaseURL')!,
+          );
+        }
+
         wsURL.search = searchParams.toString();
 
         const ws = new WebSocket(wsURL.toString());