diff --git a/frontend/src/app/onboarding/components/openai-onboarding.tsx b/frontend/src/app/onboarding/components/openai-onboarding.tsx
index b9efcd50..236097a4 100644
--- a/frontend/src/app/onboarding/components/openai-onboarding.tsx
+++ b/frontend/src/app/onboarding/components/openai-onboarding.tsx
@@ -49,6 +49,15 @@ export function OpenAIOnboarding({
     setSampleDataset(dataset);
   };
 
+  const handleGetFromEnvChange = (fromEnv: boolean) => {
+    setGetFromEnv(fromEnv);
+    if (fromEnv) {
+      setApiKey("");
+    }
+    setLanguageModel("");
+    setEmbeddingModel("");
+  };
+
   // Update settings when values change
   useUpdateSettings(
     "openai",
@@ -67,7 +76,10 @@ export function OpenAIOnboarding({
           id="get-api-key"
           flex
         >
-          <Switch checked={getFromEnv} onCheckedChange={setGetFromEnv} />
+          <Switch
+            checked={getFromEnv}
+            onCheckedChange={handleGetFromEnvChange}
+          />
         </LabelWrapper>
         {!getFromEnv && (
           <div className="space-y-1">