diff --git a/frontend/src/components/TextToSpeech/ElevenLabsOptions/index.jsx b/frontend/src/components/TextToSpeech/ElevenLabsOptions/index.jsx
index ad86caa1cbe78bd7e997047d5908344d1a5e289c..4a5e1160ce49a52536d0b81ba0616d0554e5dc3d 100644
--- a/frontend/src/components/TextToSpeech/ElevenLabsOptions/index.jsx
+++ b/frontend/src/components/TextToSpeech/ElevenLabsOptions/index.jsx
@@ -84,6 +84,7 @@ function ElevenLabsModelSelection({ apiKey, settings }) {
       <select
         name="TTSElevenLabsVoiceModel"
         required={true}
+        defaultValue={settings?.TTSElevenLabsVoiceModel}
         className="bg-zinc-900 border-gray-500 text-white text-sm rounded-lg block w-full p-2.5"
       >
         {Object.keys(groupedModels)
@@ -91,11 +92,7 @@ function ElevenLabsModelSelection({ apiKey, settings }) {
           .map((organization) => (
             <optgroup key={organization} label={organization}>
               {groupedModels[organization].map((model) => (
-                <option
-                  key={model.id}
-                  value={model.id}
-                  selected={settings?.OpenAiModelPref === model.id}
-                >
+                <option key={model.id} value={model.id}>
                   {model.name}
                 </option>
               ))}
diff --git a/frontend/src/components/TextToSpeech/OpenAiOptions/index.jsx b/frontend/src/components/TextToSpeech/OpenAiOptions/index.jsx
index 4183a4e5800cf4dbc085c6bc3157dc9689a17b3a..7982520569df7e4a83f8c6fb5100827826802aba 100644
--- a/frontend/src/components/TextToSpeech/OpenAiOptions/index.jsx
+++ b/frontend/src/components/TextToSpeech/OpenAiOptions/index.jsx
@@ -35,7 +35,11 @@ export default function OpenAiTextToSpeechOptions({ settings }) {
         >
           {["alloy", "echo", "fable", "onyx", "nova", "shimmer"].map(
             (voice) => {
-              return <option value={voice}>{toProperCase(voice)}</option>;
+              return (
+                <option key={voice} value={voice}>
+                  {toProperCase(voice)}
+                </option>
+              );
             }
           )}
         </select>
diff --git a/frontend/src/pages/GeneralSettings/AudioPreference/tts.jsx b/frontend/src/pages/GeneralSettings/AudioPreference/tts.jsx
index 6b11f1a462e294108a293a1d0f8d9cf920aec186..d428de0f4bf1d3233f0da1b8d0c24ef68e052899 100644
--- a/frontend/src/pages/GeneralSettings/AudioPreference/tts.jsx
+++ b/frontend/src/pages/GeneralSettings/AudioPreference/tts.jsx
@@ -47,7 +47,7 @@ export default function TextToSpeechProvider({ settings }) {
   const searchInputRef = useRef(null);
 
   const handleSubmit = async (e) => {
-    e.preventDefault();
+    e?.preventDefault();
     const form = e.target;
     const data = { TextToSpeechProvider: selectedProvider };
     const formData = new FormData(form);
@@ -110,10 +110,7 @@ export default function TextToSpeechProvider({ settings }) {
         </div>
         <div className="w-full justify-end flex">
           {hasChanges && (
-            <CTAButton
-              onClick={() => handleSubmit()}
-              className="mt-3 mr-0 -mb-14 z-10"
-            >
+            <CTAButton className="mt-3 mr-0 -mb-14 z-10">
               {saving ? "Saving..." : "Save changes"}
             </CTAButton>
           )}