diff --git a/packages/forge/blocks/openai/actions/createChatCompletion.tsx b/packages/forge/blocks/openai/actions/createChatCompletion.tsx
index eeae4ae61..c0f62e75a 100644
--- a/packages/forge/blocks/openai/actions/createChatCompletion.tsx
+++ b/packages/forge/blocks/openai/actions/createChatCompletion.tsx
@@ -48,7 +48,7 @@ export const createChatCompletion = createAction({
       fetch: ({ credentials, options }) =>
         fetchGPTModels({
           apiKey: credentials?.apiKey,
-          baseUrl: options.baseUrl,
+          baseUrl: credentials?.baseUrl ?? options.baseUrl,
           apiVersion: options.apiVersion,
         }),
     },