diff --git a/internal/llm/provider/gemini.go b/internal/llm/provider/gemini.go
index 3987deb7ebcc6330c9d3bcb4a52aeeb292eab43f..f8d1c6ab4f0577afe2bbbd0b12c8c11a4b203b32 100644
--- a/internal/llm/provider/gemini.go
+++ b/internal/llm/provider/gemini.go
@@ -43,9 +43,14 @@ func createGeminiClient(opts providerClientOptions) (*genai.Client, error) {
 	cc := &genai.ClientConfig{
 		APIKey:  opts.apiKey,
 		Backend: genai.BackendGeminiAPI,
-		HTTPOptions: genai.HTTPOptions{
-			BaseURL: opts.baseURL,
-		},
+	}
+	if opts.baseURL != "" {
+		resolvedBaseURL, err := config.Get().Resolve(opts.baseURL)
+		if err == nil && resolvedBaseURL != "" {
+			cc.HTTPOptions = genai.HTTPOptions{
+				BaseURL: resolvedBaseURL,
+			}
+		}
 	}
 	if config.Get().Options.Debug {
 		cc.HTTPClient = log.NewHTTPClient()
@@ -572,4 +577,4 @@ func contains(s string, substrs ...string) bool {
 		}
 	}
 	return false
-}
+}
\ No newline at end of file