diff --git a/scripts/system/selectAudioDevice.js b/scripts/system/selectAudioDevice.js
index d77bef2aec..f5929ce151 100644
--- a/scripts/system/selectAudioDevice.js
+++ b/scripts/system/selectAudioDevice.js
@@ -51,7 +51,9 @@ const OUTPUT_DEVICE_SETTING = "audio_output_device";
 var selectedInputMenu = "";
 var selectedOutputMenu = "";
 
+    var audioDevicesList = [];
 function setupAudioMenus() {
+    removeAudioMenus();
     Menu.addSeparator("Audio", "Input Audio Device");
 
     var inputDeviceSetting = Settings.getValue(INPUT_DEVICE_SETTING);
@@ -67,11 +69,12 @@ function setupAudioMenus() {
         var thisDeviceSelected = (inputDevices[i] == selectedInputDevice);
         var menuItem = "Use " + inputDevices[i] + " for Input";
         Menu.addMenuItem({
-                            menuName: "Audio",
-                            menuItemName: menuItem,
-                            isCheckable: true,
-                            isChecked: thisDeviceSelected
-                        });
+            menuName: "Audio",
+            menuItemName: menuItem,
+            isCheckable: true,
+            isChecked: thisDeviceSelected
+        });
+        audioDevicesList.push(menuItem);
         if (thisDeviceSelected) {
             selectedInputMenu = menuItem;
         }
@@ -97,46 +100,22 @@ function setupAudioMenus() {
             isCheckable: true,
             isChecked: thisDeviceSelected
         });
+        audioDevicesList.push(menuItem);
         if (thisDeviceSelected) {
             selectedOutputMenu = menuItem;
         }
     }
 }
 
-function removeAudioDevices() {
-     Menu.removeSeparator("Audio", "Input Audio Device");
-
-    var inputDeviceSetting = Settings.getValue(INPUT_DEVICE_SETTING);
-    var inputDevices = AudioDevice.getInputDevices();
-    var selectedInputDevice = AudioDevice.getInputDevice();
-    if (inputDevices.indexOf(inputDeviceSetting) != -1 && selectedInputDevice != inputDeviceSetting) {
-        if (AudioDevice.setInputDevice(inputDeviceSetting)) {
-            selectedInputDevice = inputDeviceSetting;
-        }
-    }
-    print("audio input devices: " + inputDevices);
-    for(var i = 0; i < inputDevices.length; i++) {
-        var thisDeviceSelected = (inputDevices[i] == selectedInputDevice);
-        var menuItem = "Use " + inputDevices[i] + " for Input";
-        Menu.removeMenuItem("Audio", menuItem);
-    }
-
+function removeAudioMenus() {
+    Menu.removeSeparator("Audio", "Input Audio Device");
     Menu.removeSeparator("Audio", "Output Audio Device");
 
-    var outputDeviceSetting = Settings.getValue(OUTPUT_DEVICE_SETTING);
-    var outputDevices = AudioDevice.getOutputDevices();
-    var selectedOutputDevice = AudioDevice.getOutputDevice();
-    if (outputDevices.indexOf(outputDeviceSetting) != -1 && selectedOutputDevice != outputDeviceSetting) {
-        if (AudioDevice.setOutputDevice(outputDeviceSetting)) {
-            selectedOutputDevice = outputDeviceSetting;
-        }
-    }
-    print("audio output devices: " + outputDevices);
-    for (var i = 0; i < outputDevices.length; i++) {
-        var thisDeviceSelected = (outputDevices[i] == selectedOutputDevice);
-        var menuItem = "Use " + outputDevices[i] + " for Output";
-        Menu.removeMenuItem("Audio", menuItem);
+    for (var index = 0; index < audioDevicesList.length; index++) {
+        Menu.removeMenuItem("Audio", audioDevicesList[index]);
     }
+
+    audioDevicesList = [];
 }
 
 function onDevicechanged() {
@@ -254,7 +233,7 @@ Script.update.connect(checkHMDAudio);
 
 Script.scriptEnding.connect(function () {
     restoreAudio();
-    removeAudioDevices();
+    removeAudioMenus();
     Menu.menuItemEvent.disconnect(menuItemEvent);
     Script.update.disconnect(checkHMDAudio);
 });