diff --git a/src/components/settings/acp-agent-settings.tsx b/src/components/settings/acp-agent-settings.tsx
index a76198a..b8f26df 100644
--- a/src/components/settings/acp-agent-settings.tsx
+++ b/src/components/settings/acp-agent-settings.tsx
@@ -676,6 +676,7 @@ function patchGeminiConfigText(
   if (typeof patch.model === "string") {
     delete config.model
     delete config.model_name
+    assignOrRemoveEnv(GEMINI_ENV_KEYS.model, patch.model)
   }
   assignOrRemoveEnv(GEMINI_ENV_KEYS.baseUrl, patch.apiBaseUrl)
   if (typeof patch.apiBaseUrl === "string") {
@@ -800,6 +801,12 @@ function patchGeminiAuthMode(
     next.googleApiKey = ""
     return next
   }
+  if (mode === "model_provider") {
+    next.googleCloudProject = ""
+    next.googleCloudLocation = ""
+    next.googleApplicationCredentials = ""
+    return next
+  }
   next.apiBaseUrl = ""
   next.geminiApiKey = ""
   next.googleApiKey = ""