diff --git a/src/app/settingsview/components/AudioSettings.qml b/src/app/settingsview/components/AudioSettings.qml
index 42ea45d94f5e0a892cda11347ee97076e0a638fa..5b4a29adb8ee421a16f8490a7e67ac89919f1a55 100644
--- a/src/app/settingsview/components/AudioSettings.qml
+++ b/src/app/settingsview/components/AudioSettings.qml
@@ -38,6 +38,16 @@ ColumnLayout {
         AUDIOMANAGER
     }
 
+    Connections {
+        target: UtilsAdapter
+
+        function onChangeLanguage() {
+            inputAudioModel.reset()
+            outputAudioModel.reset()
+            ringtoneAudioModel.reset()
+        }
+    }
+
     function populateAudioSettings() {
         inputComboBoxSetting.modelIndex = inputComboBoxSetting.comboModel.getCurrentIndex()
         outputComboBoxSetting.modelIndex = outputComboBoxSetting.comboModel.getCurrentIndex()
@@ -68,6 +78,7 @@ ColumnLayout {
         labelText: JamiStrings.microphone
         fontPointSize: JamiTheme.settingsFontSize
         comboModel: AudioDeviceModel {
+            id: inputAudioModel
             lrcInstance: LRCInstance
             type: AudioDeviceModel.Type.Record
         }
@@ -105,6 +116,7 @@ ColumnLayout {
         labelText: JamiStrings.outputDevice
         fontPointSize: JamiTheme.settingsFontSize
         comboModel: AudioDeviceModel {
+            id: outputAudioModel
             lrcInstance: LRCInstance
             type: AudioDeviceModel.Type.Playback
         }
@@ -129,6 +141,7 @@ ColumnLayout {
         labelText: JamiStrings.ringtoneDevice
         fontPointSize: JamiTheme.settingsFontSize
         comboModel: AudioDeviceModel {
+            id: ringtoneAudioModel
             lrcInstance: LRCInstance
             type: AudioDeviceModel.Type.Ringtone
         }
diff --git a/src/app/settingsview/components/SystemSettings.qml b/src/app/settingsview/components/SystemSettings.qml
index cf4890a1b0c6aa7909ed10c907d18f5a0de5289f..1bea24113c5ff5a0f1a4c65c566f2dbef5140380 100644
--- a/src/app/settingsview/components/SystemSettings.qml
+++ b/src/app/settingsview/components/SystemSettings.qml
@@ -202,6 +202,7 @@ ColumnLayout {
         tipText: JamiStrings.language
         fontPointSize: JamiTheme.settingsFontSize
         comboModel: ListModel {
+            id: langModel
             Component.onCompleted: {
                 var supported = UtilsAdapter.supportedLang();
                 var keys = Object.keys(supported);
@@ -236,6 +237,15 @@ ColumnLayout {
             themeModel.append({ textDisplay: JamiStrings.light })
             themeModel.append({ textDisplay: JamiStrings.dark })
             themeComboBoxSettings.modelIndex = idx
+
+            var langIdx = langComboBoxSetting.modelIndex
+            langModel.clear()
+            var supported = UtilsAdapter.supportedLang();
+            var keys = Object.keys(supported);
+            for (var i = 0 ; i < keys.length ; ++i) {
+                langModel.append({ textDisplay: supported[keys[i]], id: keys[i] })
+            }
+            langComboBoxSetting.modelIndex = langIdx
         }
     }