diff --git a/src/components/Join.vue b/src/components/Join.vue
index 5df4652..466c8f7 100644
--- a/src/components/Join.vue
+++ b/src/components/Join.vue
@@ -101,7 +101,7 @@
             <v-icon>language</v-icon><v-icon>more_horiz</v-icon>
           </v-btn>
         </v-col>
-        <SelectLanguageDialog v-model="showSelectLanguageDialog" v-on:close="showSelectLanguageDialog = false" />
+        <SelectLanguageDialog v-model="showSelectLanguageDialog" />
       </v-row>
     </div>
 
diff --git a/src/components/Profile.vue b/src/components/Profile.vue
index 71d0875..39ec25f 100644
--- a/src/components/Profile.vue
+++ b/src/components/Profile.vue
@@ -211,8 +211,8 @@
 
     <SelectLanguageDialog
       v-model="showSelectLanguageDialog"
-      v-on:close="showSelectLanguageDialog = false"
     />
+    
     <!-- Dialog for request Notification -->
     <v-dialog
       v-model="notificationDialog"
diff --git a/src/components/SelectLanguageDialog.vue b/src/components/SelectLanguageDialog.vue
index 822756f..ee8d8d1 100644
--- a/src/components/SelectLanguageDialog.vue
+++ b/src/components/SelectLanguageDialog.vue
@@ -15,11 +15,11 @@
       </v-card-title>
       <v-card-text>
         <v-select
-          v-model="$i18n.locale"
+          :model-value="$i18n.locale"
           :items="languages"
           :menu-props="{ auto: true }"
           :label="$t('profile.select_language')"
-          v-on:change="$store.commit('setLanguage', $i18n.locale)"
+          @update:model-value="(lang) => updateLanguage(lang)"
           hide-details
           prepend-icon="language"
           single-line
@@ -31,7 +31,7 @@
           depressed
           block
           class="btn-dark"
-          @click="$emit('close')"
+          @click="$emit('update:model-value', false)"
           >{{ $t("menu.done") }}</v-btn
         >
       </v-card-actions>