diff --git a/providers/anthropic/anthropic.go b/providers/anthropic/anthropic.go
index 5c7b1d4ed3123bbd5c0fad46f3d5b5e9383ab9ac..d4f6d1e50cd78118e7547e9181c4aaabb651ddc5 100644
--- a/providers/anthropic/anthropic.go
+++ b/providers/anthropic/anthropic.go
@@ -156,7 +156,7 @@ func (a *provider) LanguageModel(ctx context.Context, modelID string) (fantasy.L
 	if a.options.apiKey != "" && !a.options.useBedrock {
 		clientOptions = append(clientOptions, option.WithAPIKey(a.options.apiKey))
 	}
-	if a.options.baseURL != "" {
+	if !a.options.useBedrock && a.options.baseURL != "" {
 		clientOptions = append(clientOptions, option.WithBaseURL(a.options.baseURL))
 	}
 	defaultUA := httpheaders.DefaultUserAgent(fantasy.Version)
@@ -205,6 +205,9 @@ func (a *provider) LanguageModel(ctx context.Context, modelID string) (fantasy.L
 				)
 			}
 		}
+		if a.options.baseURL != "" {
+			clientOptions = append(clientOptions, option.WithBaseURL(a.options.baseURL))
+		}
 	}
 	return languageModel{
 		modelID:  modelID,