diff --git a/Linphone/UI/Main/Settings/Fragments/SettingsAdvancedFragment.swift b/Linphone/UI/Main/Settings/Fragments/SettingsAdvancedFragment.swift
index aa58ad13b..e428f0b5d 100644
--- a/Linphone/UI/Main/Settings/Fragments/SettingsAdvancedFragment.swift
+++ b/Linphone/UI/Main/Settings/Fragments/SettingsAdvancedFragment.swift
@@ -221,17 +221,21 @@ struct SettingsAdvancedFragment: View {
 							VStack(spacing: 0) {
 								VStack(spacing: 30) {
 									VStack(alignment: .leading) {
-										Text("call_stats_media_encryption_title")
+										Text("settings_advanced_input_audio_device_title")
 											.default_text_style_700(styleSize: 15)
 											.padding(.bottom, -5)
 										
 										Menu {
-											Button("None") { } // settingsViewModel.defaultLayout = ""}
-											Button("SRTP") { } // settingsViewModel.defaultLayout = ""}
-											Button("ZRTP") { } // settingsViewModel.defaultLayout = ""}
-											Button("DTLS") { } // settingsViewModel.defaultLayout = ""}
+											ForEach(settingsViewModel.inputAudioDeviceLabels, id: \.self) { inputAudioDevice in
+												Button(inputAudioDevice) {
+													if let inputAudioDeviceIndexTmp = settingsViewModel.inputAudioDeviceLabels.firstIndex(of: inputAudioDevice) {
+														settingsViewModel.setInputAudioDevice(index: inputAudioDeviceIndexTmp)
+													}
+												}
+											}
 										} label: {
-											Text("ZRTP")
+											Text(settingsViewModel.inputAudioDeviceIndex < settingsViewModel.inputAudioDeviceLabels.count
+												 ? settingsViewModel.inputAudioDeviceLabels[settingsViewModel.inputAudioDeviceIndex] : "")
 												.default_text_style(styleSize: 15)
 												.frame(maxWidth: .infinity, alignment: .leading)
 											Image("caret-down")
@@ -252,17 +256,21 @@ struct SettingsAdvancedFragment: View {
 									}
 									
 									VStack(alignment: .leading) {
-										Text("call_stats_media_encryption_title")
+										Text("settings_advanced_output_audio_device_title")
 											.default_text_style_700(styleSize: 15)
 											.padding(.bottom, -5)
 										
 										Menu {
-											Button("None") { } // settingsViewModel.defaultLayout = ""}
-											Button("SRTP") { } // settingsViewModel.defaultLayout = ""}
-											Button("ZRTP") { } // settingsViewModel.defaultLayout = ""}
-											Button("DTLS") { } // settingsViewModel.defaultLayout = ""}
+											ForEach(settingsViewModel.outputAudioDeviceLabels, id: \.self) { outputAudioDevice in
+												Button(outputAudioDevice) {
+													if let outputAudioDeviceIndexTmp = settingsViewModel.outputAudioDeviceLabels.firstIndex(of: outputAudioDevice) {
+														settingsViewModel.setOutputAudioDevice(index: outputAudioDeviceIndexTmp)
+													}
+												}
+											}
 										} label: {
-											Text("ZRTP")
+											Text(settingsViewModel.outputAudioDeviceIndex < settingsViewModel.outputAudioDeviceLabels.count
+												 ? settingsViewModel.outputAudioDeviceLabels[settingsViewModel.outputAudioDeviceIndex] : "")
 												.default_text_style(styleSize: 15)
 												.frame(maxWidth: .infinity, alignment: .leading)
 											Image("caret-down")
@@ -291,7 +299,8 @@ struct SettingsAdvancedFragment: View {
 							.zIndex(-1)
 							.transition(.move(edge: .top))
 						}
-						
+						*/
+						/*
 						HStack(alignment: .center) {
 							Text("settings_advanced_audio_codecs_title")
 								.default_text_style_800(styleSize: 18)
diff --git a/Linphone/UI/Main/Settings/ViewModel/SettingsViewModel.swift b/Linphone/UI/Main/Settings/ViewModel/SettingsViewModel.swift
index d4562adbc..37b390d22 100644
--- a/Linphone/UI/Main/Settings/ViewModel/SettingsViewModel.swift
+++ b/Linphone/UI/Main/Settings/ViewModel/SettingsViewModel.swift
@@ -54,6 +54,14 @@ class SettingsViewModel: ObservableObject {
 	@Published var uploadServerUrl: String = ""
 	@Published var remoteProvisioningUrl: String = ""
 	
+	@Published var inputAudioDeviceLabels: [String] = []
+	@Published var inputAudioDeviceValues: [AudioDevice] = []
+	@Published var inputAudioDeviceIndex: Int = 0
+	
+	@Published var outputAudioDeviceLabels: [String] = []
+	@Published var outputAudioDeviceValues: [AudioDevice] = []
+	@Published var outputAudioDeviceIndex: Int = 0
+	
 	init() {
 		CoreContext.shared.doOnCoreQueue { core in
 			
@@ -115,15 +123,19 @@ class SettingsViewModel: ObservableObject {
 				self.uploadServerUrl = fileSharingServerUrlTmp ?? ""
 				self.remoteProvisioningUrl = remoteProvisioningUrlTmp ?? ""
 				
+				/*
+				self.setupAudioDevices()
+				
 				self.coreDelegate = CoreDelegateStub(
 					onAudioDevicesListUpdated: { (_: Core) in
 						Log.info(
 							"\(SettingsViewModel.TAG) Audio devices list has changed, update available input/output audio devices list"
 						)
-						// setupAudioDevices()
+						self.setupAudioDevices()
 					}
 				)
 				core.addDelegate(delegate: self.coreDelegate!)
+				*/
 			}
 		}
 	}
@@ -152,6 +164,91 @@ class SettingsViewModel: ObservableObject {
 		}
 	}
 	
+	func setInputAudioDevice(index: Int) {
+		CoreContext.shared.doOnCoreQueue { core in
+			let audioDevice = self.inputAudioDeviceValues[index]
+			core.defaultInputAudioDevice = audioDevice
+		}
+	}
+	
+	func setOutputAudioDevice(index: Int) {
+		CoreContext.shared.doOnCoreQueue { core in
+			let audioDevice = self.outputAudioDeviceValues[index]
+			core.defaultOutputAudioDevice = audioDevice
+		}
+	}
+	
+	func setupAudioDevices() {
+		CoreContext.shared.doOnCoreQueue { core in
+			DispatchQueue.main.async {
+				self.inputAudioDeviceLabels = []
+				self.inputAudioDeviceValues = []
+				self.inputAudioDeviceIndex = 0
+				self.outputAudioDeviceLabels = []
+				self.outputAudioDeviceValues = []
+				self.outputAudioDeviceIndex = 0
+			}
+			
+			// let audioSession = AVAudioSession.sharedInstance()
+			// try? audioSession.setActive(true)
+			
+			// Input Audio Devices
+			var inputIndex = 0
+			let defaultInputAudioDevice = core.defaultInputAudioDevice
+			Log.info("\(SettingsViewModel.TAG) Current default input audio device is \(defaultInputAudioDevice?.id ?? "Error defaultInputAudioDevice id")")
+			
+			var inputAudioDeviceLabelsTmp = [String]()
+			var inputAudioDeviceValuesTmp = [AudioDevice]()
+			var inputAudioDeviceIndexTmp = inputIndex
+			
+			core.extendedAudioDevices.forEach { audioDevice in
+				if audioDevice.hasCapability(capability: AudioDevice.Capabilities.CapabilityRecord) {
+					inputAudioDeviceLabelsTmp.append(audioDevice.id)
+					inputAudioDeviceValuesTmp.append(audioDevice)
+					if audioDevice.id == defaultInputAudioDevice?.id {
+						inputAudioDeviceIndexTmp = inputIndex
+					}
+					Log.info("\(SettingsViewModel.TAG) Input audio device is \(audioDevice.id) \(audioDevice.capabilities)")
+					inputIndex += 1
+				}
+				Log.info("\(SettingsViewModel.TAG) ---- 1 Input audio device is \(audioDevice.id) \(audioDevice.capabilities)")
+			}
+			
+			DispatchQueue.main.async {
+				self.inputAudioDeviceLabels = inputAudioDeviceLabelsTmp
+				self.inputAudioDeviceValues = inputAudioDeviceValuesTmp
+				self.inputAudioDeviceIndex = inputAudioDeviceIndexTmp
+			}
+			
+			// Output Audio Devices
+			var outputIndex = 0
+			let defaultOutputAudioDevice = core.defaultOutputAudioDevice
+			Log.info("\(SettingsViewModel.TAG) Current default output audio device is \(defaultOutputAudioDevice?.id ?? "Error defaultOutputAudioDevice id")")
+			
+			var outputAudioDeviceLabelsTmp = [String]()
+			var outputAudioDeviceValuesTmp = [AudioDevice]()
+			var outputAudioDeviceIndexTmp = outputIndex
+			
+			core.extendedAudioDevices.forEach { audioDevice in
+				if audioDevice.hasCapability(capability: AudioDevice.Capabilities.CapabilityPlay) {
+					outputAudioDeviceLabelsTmp.append(audioDevice.id)
+					outputAudioDeviceValuesTmp.append(audioDevice)
+					if audioDevice.id == defaultOutputAudioDevice?.id {
+						outputAudioDeviceIndexTmp = outputIndex
+					}
+					Log.info("\(SettingsViewModel.TAG) Output audio device is \(audioDevice.id) \(audioDevice.capabilities)")
+					outputIndex += 1
+				}
+			}
+			
+			DispatchQueue.main.async {
+				self.outputAudioDeviceLabels = outputAudioDeviceLabelsTmp
+				self.outputAudioDeviceValues = outputAudioDeviceValuesTmp
+				self.outputAudioDeviceIndex = outputAudioDeviceIndexTmp
+			}
+		}
+	}
+	
 	func saveChangesWhenLeaving() {
 		CoreContext.shared.doOnCoreQueue { core in
 			if CorePreferences.vfsEnabled != self.enableVfs {