diff --git a/internal/llm/provider/anthropic.go b/internal/llm/provider/anthropic.go
index 44bc8a101f992511ec9f510d9ed4770f41896e45..4448cd79d52782e2ec8a2410e03aa6f59e6ed16c 100644
--- a/internal/llm/provider/anthropic.go
+++ b/internal/llm/provider/anthropic.go
@@ -81,7 +81,7 @@ func createAnthropicClient(opts providerClientOptions, tp AnthropicClientType) a
 
 	if opts.baseURL != "" {
 		resolvedBaseURL, err := config.Get().Resolve(opts.baseURL)
-		if err == nil {
+		if err == nil && resolvedBaseURL != "" {
 			anthropicClientOptions = append(anthropicClientOptions, option.WithBaseURL(resolvedBaseURL))
 		}
 	}
diff --git a/internal/llm/provider/openai.go b/internal/llm/provider/openai.go
index aafb7168fc6aa9e3841802f20f95bfaa38662fa9..a7c46f47dd30b83637119a3a50e0d655f3b3b355 100644
--- a/internal/llm/provider/openai.go
+++ b/internal/llm/provider/openai.go
@@ -44,7 +44,7 @@ func createOpenAIClient(opts providerClientOptions) openai.Client {
 	}
 	if opts.baseURL != "" {
 		resolvedBaseURL, err := config.Get().Resolve(opts.baseURL)
-		if err == nil {
+		if err == nil && resolvedBaseURL != "" {
 			openaiClientOptions = append(openaiClientOptions, option.WithBaseURL(resolvedBaseURL))
 		}
 	}