diff --git a/src/app/mainview/components/CallActionBar.qml b/src/app/mainview/components/CallActionBar.qml
index 5976003b0512d63bd70ace2b7ede5163c0b15d77..222b76252c1f9e62cd8bc43e19795055c3d4c6cc 100644
--- a/src/app/mainview/components/CallActionBar.qml
+++ b/src/app/mainview/components/CallActionBar.qml
@@ -108,9 +108,7 @@ Control {
             }
             function accept(index) {
                 AvAdapter.stopAudioMeter()
-                AVModel.setOutputDevice(listModel.data(
-                                        listModel.index(index, 0),
-                                        AudioDeviceModel.RawDeviceName))
+                AVModel.setOutputDevice(index)
                 AvAdapter.startAudioMeter()
             }
         },
diff --git a/src/app/mainview/components/CallButtonDelegate.qml b/src/app/mainview/components/CallButtonDelegate.qml
index 5726555764639573c69922cba008ea2a893d8c00..fcb73c361f7159288a43fa776df717a5c043cecb 100644
--- a/src/app/mainview/components/CallButtonDelegate.qml
+++ b/src/app/mainview/components/CallButtonDelegate.qml
@@ -208,7 +208,7 @@ ItemDelegate {
             radius: 4
         }
 
-        onActivated: menuAction.accept(index)
+        onActivated: index => menuAction.accept(index)
         model: visible ? menuAction.listModel : null
         delegate: ItemDelegate {
             id: menuItem