diff --git a/src/components/views/CustomizeView.js b/src/components/views/CustomizeView.js
index 59ec968..68b0bf5 100644
--- a/src/components/views/CustomizeView.js
+++ b/src/components/views/CustomizeView.js
@@ -262,6 +262,7 @@ export class CustomizeView extends LitElement {
 
   getLanguages() {
     return [
+      { value: "auto", name: "Auto (Multilingual)" },
       { value: "en-US", name: "English (US)" },
       { value: "en-GB", name: "English (UK)" },
       { value: "en-AU", name: "English (Australia)" },
@@ -727,7 +728,10 @@ export class CustomizeView extends LitElement {
             >
               ${this.getLanguages().map(
                 (language) =>
-                  html`<option value=${language.value}>
+                  html`<option
+                    value=${language.value}
+                    ?selected=${language.value === this.selectedLanguage}
+                  >
                     ${language.name}
                   </option>`,
               )}
diff --git a/src/utils/gemini.js b/src/utils/gemini.js
index 3645e4e..7274853 100644
--- a/src/utils/gemini.js
+++ b/src/utils/gemini.js
@@ -732,7 +732,9 @@ async function initializeGeminiSession(
         inputAudioTranscription: {},
         tools: enabledTools,
         contextWindowCompression: { slidingWindow: {} },
-        speechConfig: { languageCode: language },
+        ...(language && language !== "auto"
+          ? { speechConfig: { languageCode: language } }
+          : {}),
         systemInstruction: {
           parts: [{ text: systemPrompt }],
         },