diff --git a/.env.example b/.env.example
index fade420..18990c5 100644
--- a/.env.example
+++ b/.env.example
@@ -18,7 +18,7 @@ ANTHROPIC_API_KEY=
 # Get your OpenRouter API Key in your account settings -
 # https://openrouter.ai/settings/keys
 # You only need this environment variable set if you want to use OpenRouter models
-OPEN_ROUTER_API_KEY=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
+OPEN_ROUTER_API_KEY=
 
 # Get your Google Generative AI API Key by following these instructions -
 # https://console.cloud.google.com/apis/credentials
diff --git a/app/components/chat/BaseChat.tsx b/app/components/chat/BaseChat.tsx
index abfdaa5..b1a0c49 100644
--- a/app/components/chat/BaseChat.tsx
+++ b/app/components/chat/BaseChat.tsx
@@ -30,7 +30,11 @@ const ModelSelector = ({ model, setModel, modelList, providerList }) => {
     <div className="mb-2">
       <select 
         value={provider}
-        onChange={(e) => setProvider(e.target.value)}
+        onChange={(e) => {
+          setProvider(e.target.value);
+          const firstModel = [...modelList].find(m => m.provider == e.target.value);
+          setModel(firstModel ? firstModel.name : '');
+        }}
         className="w-full p-2 rounded-lg border border-bolt-elements-borderColor bg-bolt-elements-prompt-background text-bolt-elements-textPrimary focus:outline-none"
       >
         {providerList.map((provider) => (
@@ -38,23 +42,24 @@ const ModelSelector = ({ model, setModel, modelList, providerList }) => {
             {provider}
           </option>
         ))}
-
+          <option key="Ollama" value="Ollama">
+            Ollama
+          </option>        
       </select>
       <select
         value={model}
-        provider={provider}
         onChange={(e) => setModel(e.target.value)}
         className="w-full p-2 rounded-lg border border-bolt-elements-borderColor bg-bolt-elements-prompt-background text-bolt-elements-textPrimary focus:outline-none"
       >
-        {[...modelList].filter( e => e.provider == provider ).map((modelOption) => (
+        {[...modelList].filter(e => e.provider == provider && e.name).map((modelOption) => (
           <option key={modelOption.name} value={modelOption.name}>
             {modelOption.label}
           </option>
         ))}
       </select>
     </div>
-  )
-}
+  );
+};
 
 const TEXTAREA_MIN_HEIGHT = 76;
 
diff --git a/package.json b/package.json
index 7f3faea..737ca05 100644
--- a/package.json
+++ b/package.json
@@ -24,6 +24,7 @@
   },
   "dependencies": {
     "@ai-sdk/anthropic": "^0.0.39",
+    "@ai-sdk/google": "^0.0.52",
     "@ai-sdk/openai": "^0.0.66",
     "@codemirror/autocomplete": "^6.17.0",
     "@codemirror/commands": "^6.6.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 69a4b0c..46dc9db 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -14,6 +14,9 @@ importers:
       '@ai-sdk/anthropic':
         specifier: ^0.0.39
         version: 0.0.39(zod@3.23.8)
+      '@ai-sdk/google':
+        specifier: ^0.0.52
+        version: 0.0.52(zod@3.23.8)
       '@ai-sdk/openai':
         specifier: ^0.0.66
         version: 0.0.66(zod@3.23.8)
@@ -255,6 +258,12 @@ packages:
     peerDependencies:
       zod: ^3.0.0
 
+  '@ai-sdk/google@0.0.52':
+    resolution: {integrity: sha512-bfsA/1Ae0SQ6NfLwWKs5SU4MBwlzJjVhK6bTVBicYFjUxg9liK/W76P1Tq/qK9OlrODACz3i1STOIWsFPpIOuQ==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      zod: ^3.0.0
+
   '@ai-sdk/openai@0.0.66':
     resolution: {integrity: sha512-V4XeDnlNl5/AY3GB3ozJUjqnBLU5pK3DacKTbCNH3zH8/MggJoH6B8wRGdLUPVFMcsMz60mtvh4DC9JsIVFrKw==}
     engines: {node: '>=18'}
@@ -5371,6 +5380,13 @@ snapshots:
       '@ai-sdk/provider-utils': 1.0.9(zod@3.23.8)
       zod: 3.23.8
 
+  '@ai-sdk/google@0.0.52(zod@3.23.8)':
+    dependencies:
+      '@ai-sdk/provider': 0.0.24
+      '@ai-sdk/provider-utils': 1.0.20(zod@3.23.8)
+      json-schema: 0.4.0
+      zod: 3.23.8
+
   '@ai-sdk/openai@0.0.66(zod@3.23.8)':
     dependencies:
       '@ai-sdk/provider': 0.0.24