diff --git a/packages/aiCore/src/core/providers/factory.ts b/packages/aiCore/src/core/providers/factory.ts
index bbd914373d..79b82d74ca 100644
--- a/packages/aiCore/src/core/providers/factory.ts
+++ b/packages/aiCore/src/core/providers/factory.ts
@@ -130,6 +130,9 @@ export class ProviderConfigBuilder<T extends ProviderId = ProviderId> {
       }
       if (options.location) {
         googleConfig.location = options.location
+        if (options.location === 'global') {
+          googleConfig.baseURL = 'https://aiplatform.googleapis.com'
+        }
       }
     }
     return this
diff --git a/src/renderer/src/aiCore/index_new.ts b/src/renderer/src/aiCore/index_new.ts
index 18d47c2c8f..ff8ce0f0ce 100644
--- a/src/renderer/src/aiCore/index_new.ts
+++ b/src/renderer/src/aiCore/index_new.ts
@@ -47,7 +47,11 @@ function providerToAiSdkConfig(provider: Provider): {
     actualProvider = createVertexProvider(provider)
   }
 
-  if (actualProvider.type === 'openai' || actualProvider.type === 'anthropic') {
+  if (
+    actualProvider.type === 'openai' ||
+    actualProvider.type === 'anthropic' ||
+    actualProvider.type === 'openai-response'
+  ) {
     actualProvider.apiHost = formatApiHost(actualProvider.apiHost)
   }
 
@@ -62,7 +66,16 @@ function providerToAiSdkConfig(provider: Provider): {
       : undefined
 
   if (AiCore.isSupported(aiSdkProviderId) && aiSdkProviderId !== 'openai-compatible') {
-    const options = ProviderConfigFactory.fromProvider(aiSdkProviderId, actualProvider, openaiResponseOptions)
+    const options = ProviderConfigFactory.fromProvider(
+      aiSdkProviderId,
+      {
+        baseURL: actualProvider.apiHost,
+        apiKey: actualProvider.apiKey,
+        headers: actualProvider.extra_headers
+      },
+      openaiResponseOptions
+    )
+
     return {
       providerId: aiSdkProviderId as ProviderId,
       options