diff --git a/app/client/platforms/openai.ts b/app/client/platforms/openai.ts
index 706952d5c..71d93504e 100644
--- a/app/client/platforms/openai.ts
+++ b/app/client/platforms/openai.ts
@@ -99,8 +99,13 @@ export class ChatGPTApi implements LLMApi {
 
     if (baseUrl.length === 0) {
       const isApp = !!getClientConfig()?.isApp;
+      const isAIFoundation = accessStore.azureUrl?.includes(".models.ai.azure.com");
+      if (isAzure && isAIFoundation) {
+        baseUrl = accessStore.azureUrl || "";
+      } else {
       const apiPath = isAzure ? ApiPath.Azure : ApiPath.OpenAI;
       baseUrl = isApp ? OPENAI_BASE_URL : apiPath;
+      }
     }
 
     if (baseUrl.endsWith("/")) {