diff --git a/apps/stage-tamagotchi/src/renderer/src/pages/settings/modules/speech.vue b/apps/stage-tamagotchi/src/renderer/src/pages/settings/modules/speech.vue
index 92670937f..32852f371 100644
--- a/apps/stage-tamagotchi/src/renderer/src/pages/settings/modules/speech.vue
+++ b/apps/stage-tamagotchi/src/renderer/src/pages/settings/modules/speech.vue
@@ -14,7 +14,7 @@ const {
 const {
   activeSpeechProvider,
   activeSpeechModel,
-  voiceName,
+  voiceId,
   pitch,
   rate,
   isLoadingSpeechProviderVoices,
@@ -26,7 +26,7 @@ const {
 
 const router = useRouter()
 const ssmlExample = ref(`<speak>
-  Hello, my name is <voice name="${voiceName.value || 'Default'}">
+  Hello, my name is <voice name="${voiceId.value || 'Default'}">
     <prosody pitch="+${pitch.value || 0}%" rate="${rate.value || 1}">
       AI Assistant
     </prosody>
@@ -40,18 +40,18 @@ onMounted(async () => {
 })
 
 function updateVoiceName(value: string) {
-  voiceName.value = value
+  voiceId.value = value
   updateSSMLExample()
 }
 
 function updateCustomVoiceName(value: string) {
-  voiceName.value = value
+  voiceId.value = value
   updateSSMLExample()
 }
 
 function updateSSMLExample() {
   ssmlExample.value = `<speak>
-  Hello, my name is <voice name="${voiceName.value || 'Default'}">
+  Hello, my name is <voice name="${voiceId.value || 'Default'}">
     <prosody pitch="+${pitch.value || 0}%" rate="${rate.value || 1}">
       AI Assistant
     </prosody>
@@ -159,7 +159,7 @@ function updateSSMLExample() {
         <!-- Voice selection with RadioCardDetailManySelect -->
         <div v-else-if="availableVoices[activeSpeechProvider] && availableVoices[activeSpeechProvider].length > 0" class="space-y-6">
           <RadioCardDetailManySelect
-            v-model="voiceName"
+            v-model="voiceId"
             v-model:search-query="voiceSearchQuery"
             :items="availableVoices[activeSpeechProvider]?.map(voice => ({
               id: voice.name,
@@ -284,7 +284,8 @@ function updateSSMLExample() {
               Voice Name
             </label>
             <input
-              v-model="voiceName" type="text"
+              v-model="voiceId"
+              type="text"
               class="w-full border border-neutral-300 rounded bg-white px-3 py-2 dark:border-neutral-700 dark:bg-neutral-900"
               placeholder="Enter voice name (e.g., 'Rachel', 'Josh')"
               @input="(event) => updateVoiceName((event.target as HTMLInputElement).value)"
diff --git a/apps/stage-tamagotchi/src/renderer/src/pages/settings/providers/elevenlabs.vue b/apps/stage-tamagotchi/src/renderer/src/pages/settings/providers/elevenlabs.vue
index 46c78fb95..4efd04491 100644
--- a/apps/stage-tamagotchi/src/renderer/src/pages/settings/providers/elevenlabs.vue
+++ b/apps/stage-tamagotchi/src/renderer/src/pages/settings/providers/elevenlabs.vue
@@ -156,14 +156,6 @@ watch([apiKey, baseUrl, similarityBoost, stability, speed, style, useSpeakerBoos
   }
 })
 
-watch(selectedLanguage, (newLanguage) => {
-  speechStore.setLanguage(newLanguage)
-})
-
-watch(selectedVoice, (newVoice) => {
-  speechStore.setVoiceName(newVoice)
-})
-
 // Function to generate speech
 async function generateTestSpeech() {
   if (!testText.value.trim())
diff --git a/apps/stage-web/src/pages/settings/modules/speech.vue b/apps/stage-web/src/pages/settings/modules/speech.vue
index 92670937f..32852f371 100644
--- a/apps/stage-web/src/pages/settings/modules/speech.vue
+++ b/apps/stage-web/src/pages/settings/modules/speech.vue
@@ -14,7 +14,7 @@ const {
 const {
   activeSpeechProvider,
   activeSpeechModel,
-  voiceName,
+  voiceId,
   pitch,
   rate,
   isLoadingSpeechProviderVoices,
@@ -26,7 +26,7 @@ const {
 
 const router = useRouter()
 const ssmlExample = ref(`<speak>
-  Hello, my name is <voice name="${voiceName.value || 'Default'}">
+  Hello, my name is <voice name="${voiceId.value || 'Default'}">
     <prosody pitch="+${pitch.value || 0}%" rate="${rate.value || 1}">
       AI Assistant
     </prosody>
@@ -40,18 +40,18 @@ onMounted(async () => {
 })
 
 function updateVoiceName(value: string) {
-  voiceName.value = value
+  voiceId.value = value
   updateSSMLExample()
 }
 
 function updateCustomVoiceName(value: string) {
-  voiceName.value = value
+  voiceId.value = value
   updateSSMLExample()
 }
 
 function updateSSMLExample() {
   ssmlExample.value = `<speak>
-  Hello, my name is <voice name="${voiceName.value || 'Default'}">
+  Hello, my name is <voice name="${voiceId.value || 'Default'}">
     <prosody pitch="+${pitch.value || 0}%" rate="${rate.value || 1}">
       AI Assistant
     </prosody>
@@ -159,7 +159,7 @@ function updateSSMLExample() {
         <!-- Voice selection with RadioCardDetailManySelect -->
         <div v-else-if="availableVoices[activeSpeechProvider] && availableVoices[activeSpeechProvider].length > 0" class="space-y-6">
           <RadioCardDetailManySelect
-            v-model="voiceName"
+            v-model="voiceId"
             v-model:search-query="voiceSearchQuery"
             :items="availableVoices[activeSpeechProvider]?.map(voice => ({
               id: voice.name,
@@ -284,7 +284,8 @@ function updateSSMLExample() {
               Voice Name
             </label>
             <input
-              v-model="voiceName" type="text"
+              v-model="voiceId"
+              type="text"
               class="w-full border border-neutral-300 rounded bg-white px-3 py-2 dark:border-neutral-700 dark:bg-neutral-900"
               placeholder="Enter voice name (e.g., 'Rachel', 'Josh')"
               @input="(event) => updateVoiceName((event.target as HTMLInputElement).value)"
diff --git a/apps/stage-web/src/pages/settings/providers/elevenlabs.vue b/apps/stage-web/src/pages/settings/providers/elevenlabs.vue
index 46c78fb95..4efd04491 100644
--- a/apps/stage-web/src/pages/settings/providers/elevenlabs.vue
+++ b/apps/stage-web/src/pages/settings/providers/elevenlabs.vue
@@ -156,14 +156,6 @@ watch([apiKey, baseUrl, similarityBoost, stability, speed, style, useSpeakerBoos
   }
 })
 
-watch(selectedLanguage, (newLanguage) => {
-  speechStore.setLanguage(newLanguage)
-})
-
-watch(selectedVoice, (newVoice) => {
-  speechStore.setVoiceName(newVoice)
-})
-
 // Function to generate speech
 async function generateTestSpeech() {
   if (!testText.value.trim())
diff --git a/packages/stage-ui/src/stores/modules/speech.ts b/packages/stage-ui/src/stores/modules/speech.ts
index 749153391..c48fc5610 100644
--- a/packages/stage-ui/src/stores/modules/speech.ts
+++ b/packages/stage-ui/src/stores/modules/speech.ts
@@ -14,6 +14,7 @@ export const useSpeechStore = defineStore('speech', () => {
   const activeSpeechProvider = useLocalStorage('settings/speech/active-provider', '')
   const activeSpeechModel = useLocalStorage('settings/speech/active-model', 'eleven_multilingual_v2')
   const voiceName = useLocalStorage('settings/speech/voice-name', '')
+  const voiceId = useLocalStorage('settings/speech/voice-id', '')
   const pitch = useLocalStorage('settings/speech/pitch', 0)
   const rate = useLocalStorage('settings/speech/rate', 1)
   const ssmlEnabled = useLocalStorage('settings/speech/ssml-enabled', false)
@@ -137,6 +138,7 @@ export const useSpeechStore = defineStore('speech', () => {
     activeSpeechProvider,
     activeSpeechModel,
     voiceName,
+    voiceId,
     pitch,
     rate,
     ssmlEnabled,