diff --git a/apps/desktop/src/components/settings/views/ai.tsx b/apps/desktop/src/components/settings/views/ai.tsx
index 58156d2b6a..166008ec82 100644
--- a/apps/desktop/src/components/settings/views/ai.tsx
+++ b/apps/desktop/src/components/settings/views/ai.tsx
@@ -217,6 +217,9 @@ export default function LocalAI() {
         newSet.delete(modelKey);
         return newSet;
       });
+
+      setSelectedSTTModel(modelKey);
+      localSttCommands.setCurrentModel(modelKey as any);
     }, queryClient);
   };
 
@@ -233,6 +236,8 @@ export default function LocalAI() {
       });
 
       setSelectedLLMModel(modelKey);
+      localLlmCommands.setCurrentModel(modelKey as SupportedModel);
+      setCustomLLMEnabledMutation.mutate(false);
     }, queryClient);
   };
 
diff --git a/apps/desktop/src/locales/en/messages.po b/apps/desktop/src/locales/en/messages.po
index e2f1c372e6..e8fdb2a30b 100644
--- a/apps/desktop/src/locales/en/messages.po
+++ b/apps/desktop/src/locales/en/messages.po
@@ -346,12 +346,12 @@ msgstr "Annual"
 msgid "Anyone with the link can view this page"
 msgstr "Anyone with the link can view this page"
 
-#: src/components/settings/views/ai.tsx:757
+#: src/components/settings/views/ai.tsx:762
 msgid "API Base URL"
 msgstr "API Base URL"
 
 #: src/components/settings/views/integrations.tsx:197
-#: src/components/settings/views/ai.tsx:783
+#: src/components/settings/views/ai.tsx:788
 msgid "API Key"
 msgstr "API Key"
 
@@ -472,7 +472,7 @@ msgstr "Company name"
 #~ msgid "Connect"
 #~ msgstr "Connect"
 
-#: src/components/settings/views/ai.tsx:737
+#: src/components/settings/views/ai.tsx:742
 msgid "Connect to a self-hosted or third-party LLM endpoint (OpenAI API compatible)."
 msgstr "Connect to a self-hosted or third-party LLM endpoint (OpenAI API compatible)."
 
@@ -504,7 +504,7 @@ msgstr "Contacts Access"
 msgid "Continue"
 msgstr "Continue"
 
-#: src/components/settings/views/ai.tsx:869
+#: src/components/settings/views/ai.tsx:874
 msgid "Control how creative the AI enhancement should be"
 msgstr "Control how creative the AI enhancement should be"
 
@@ -529,7 +529,7 @@ msgstr "Create Note"
 msgid "Create your first template to get started"
 msgstr "Create your first template to get started"
 
-#: src/components/settings/views/ai.tsx:866
+#: src/components/settings/views/ai.tsx:871
 msgid "Creativity Level"
 msgstr "Creativity Level"
 
@@ -537,7 +537,7 @@ msgstr "Creativity Level"
 msgid "Current Plan"
 msgstr "Current Plan"
 
-#: src/components/settings/views/ai.tsx:734
+#: src/components/settings/views/ai.tsx:739
 msgid "Custom Endpoint"
 msgstr "Custom Endpoint"
 
@@ -600,7 +600,7 @@ msgstr "Enable"
 msgid "Enable Integration"
 msgstr "Enable Integration"
 
-#: src/components/settings/views/ai.tsx:607
+#: src/components/settings/views/ai.tsx:612
 msgid "Enhancing"
 msgstr "Enhancing"
 
@@ -612,11 +612,11 @@ msgstr "Enter a section title"
 #~ msgid "Enter model name (e.g., gpt-4, llama3.2:3b)"
 #~ msgstr "Enter model name (e.g., gpt-4, llama3.2:3b)"
 
-#: src/components/settings/views/ai.tsx:786
+#: src/components/settings/views/ai.tsx:791
 msgid "Enter the API key for your custom LLM endpoint"
 msgstr "Enter the API key for your custom LLM endpoint"
 
-#: src/components/settings/views/ai.tsx:760
+#: src/components/settings/views/ai.tsx:765
 msgid "Enter the base URL for your custom LLM endpoint"
 msgstr "Enter the base URL for your custom LLM endpoint"
 
@@ -779,7 +779,7 @@ msgstr "LinkedIn username"
 msgid "Live summary of the meeting"
 msgstr "Live summary of the meeting"
 
-#: src/components/settings/views/ai.tsx:820
+#: src/components/settings/views/ai.tsx:825
 msgid "Loading available models..."
 msgstr "Loading available models..."
 
@@ -825,7 +825,7 @@ msgstr "Members"
 msgid "Microphone Access"
 msgstr "Microphone Access"
 
-#: src/components/settings/views/ai.tsx:808
+#: src/components/settings/views/ai.tsx:813
 msgid "Model Name"
 msgstr "Model Name"
 
@@ -967,7 +967,7 @@ msgstr "Pause"
 msgid "people"
 msgstr "people"
 
-#: src/components/settings/views/ai.tsx:468
+#: src/components/settings/views/ai.tsx:473
 msgid "Performance difference between languages"
 msgstr "Performance difference between languages"
 
@@ -1057,7 +1057,7 @@ msgstr "Search..."
 msgid "Sections"
 msgstr "Sections"
 
-#: src/components/settings/views/ai.tsx:811
+#: src/components/settings/views/ai.tsx:816
 msgid "Select a model from the dropdown (if available) or manually enter the model name required by your endpoint."
 msgstr "Select a model from the dropdown (if available) or manually enter the model name required by your endpoint."
 
@@ -1199,7 +1199,7 @@ msgstr "Toggle left sidebar"
 msgid "Toggle widget panel"
 msgstr "Toggle widget panel"
 
-#: src/components/settings/views/ai.tsx:459
+#: src/components/settings/views/ai.tsx:464
 msgid "Transcribing"
 msgstr "Transcribing"
 
diff --git a/apps/desktop/src/locales/ko/messages.po b/apps/desktop/src/locales/ko/messages.po
index 1b4473ff38..f05b86f077 100644
--- a/apps/desktop/src/locales/ko/messages.po
+++ b/apps/desktop/src/locales/ko/messages.po
@@ -346,12 +346,12 @@ msgstr ""
 msgid "Anyone with the link can view this page"
 msgstr ""
 
-#: src/components/settings/views/ai.tsx:757
+#: src/components/settings/views/ai.tsx:762
 msgid "API Base URL"
 msgstr ""
 
 #: src/components/settings/views/integrations.tsx:197
-#: src/components/settings/views/ai.tsx:783
+#: src/components/settings/views/ai.tsx:788
 msgid "API Key"
 msgstr ""
 
@@ -472,7 +472,7 @@ msgstr ""
 #~ msgid "Connect"
 #~ msgstr ""
 
-#: src/components/settings/views/ai.tsx:737
+#: src/components/settings/views/ai.tsx:742
 msgid "Connect to a self-hosted or third-party LLM endpoint (OpenAI API compatible)."
 msgstr ""
 
@@ -504,7 +504,7 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
-#: src/components/settings/views/ai.tsx:869
+#: src/components/settings/views/ai.tsx:874
 msgid "Control how creative the AI enhancement should be"
 msgstr ""
 
@@ -529,7 +529,7 @@ msgstr ""
 msgid "Create your first template to get started"
 msgstr ""
 
-#: src/components/settings/views/ai.tsx:866
+#: src/components/settings/views/ai.tsx:871
 msgid "Creativity Level"
 msgstr ""
 
@@ -537,7 +537,7 @@ msgstr ""
 msgid "Current Plan"
 msgstr ""
 
-#: src/components/settings/views/ai.tsx:734
+#: src/components/settings/views/ai.tsx:739
 msgid "Custom Endpoint"
 msgstr ""
 
@@ -600,7 +600,7 @@ msgstr ""
 msgid "Enable Integration"
 msgstr "Enable Integration"
 
-#: src/components/settings/views/ai.tsx:607
+#: src/components/settings/views/ai.tsx:612
 msgid "Enhancing"
 msgstr "Enhancing"
 
@@ -612,11 +612,11 @@ msgstr ""
 #~ msgid "Enter model name (e.g., gpt-4, llama3.2:3b)"
 #~ msgstr ""
 
-#: src/components/settings/views/ai.tsx:786
+#: src/components/settings/views/ai.tsx:791
 msgid "Enter the API key for your custom LLM endpoint"
 msgstr ""
 
-#: src/components/settings/views/ai.tsx:760
+#: src/components/settings/views/ai.tsx:765
 msgid "Enter the base URL for your custom LLM endpoint"
 msgstr ""
 
@@ -779,7 +779,7 @@ msgstr ""
 msgid "Live summary of the meeting"
 msgstr ""
 
-#: src/components/settings/views/ai.tsx:820
+#: src/components/settings/views/ai.tsx:825
 msgid "Loading available models..."
 msgstr ""
 
@@ -825,7 +825,7 @@ msgstr ""
 msgid "Microphone Access"
 msgstr ""
 
-#: src/components/settings/views/ai.tsx:808
+#: src/components/settings/views/ai.tsx:813
 msgid "Model Name"
 msgstr ""
 
@@ -967,7 +967,7 @@ msgstr ""
 msgid "people"
 msgstr ""
 
-#: src/components/settings/views/ai.tsx:468
+#: src/components/settings/views/ai.tsx:473
 msgid "Performance difference between languages"
 msgstr ""
 
@@ -1057,7 +1057,7 @@ msgstr ""
 msgid "Sections"
 msgstr ""
 
-#: src/components/settings/views/ai.tsx:811
+#: src/components/settings/views/ai.tsx:816
 msgid "Select a model from the dropdown (if available) or manually enter the model name required by your endpoint."
 msgstr ""
 
@@ -1199,7 +1199,7 @@ msgstr ""
 msgid "Toggle widget panel"
 msgstr ""
 
-#: src/components/settings/views/ai.tsx:459
+#: src/components/settings/views/ai.tsx:464
 msgid "Transcribing"
 msgstr ""