diff --git a/interface/resources/qml/hifi/audio/Audio.qml b/interface/resources/qml/hifi/audio/Audio.qml
index fe86d7d930..69cbad458b 100644
--- a/interface/resources/qml/hifi/audio/Audio.qml
+++ b/interface/resources/qml/hifi/audio/Audio.qml
@@ -345,7 +345,6 @@ Rectangle {
                 color: hifi.colors.white;
                 text: qsTr("Choose input device");
             }
-
         }
 
         ListView {
@@ -394,6 +393,7 @@ Rectangle {
                 }
             }
         }
+
         AudioControls.LoopbackAudio {
             id: loopbackAudio
             x: margins.paddings
@@ -438,6 +438,14 @@ Rectangle {
                 color: hifi.colors.white;
                 text: qsTr("Choose output device");
             }
+
+            AudioControls.PlaySampleSound {
+                x: margins.paddings
+
+                visible: (bar.currentIndex === 1 && isVR) ||
+                         (bar.currentIndex === 0 && !isVR);
+                anchors { right: parent.right }
+            }
         }
 
         ListView {
diff --git a/interface/resources/qml/hifi/audio/LoopbackAudio.qml b/interface/resources/qml/hifi/audio/LoopbackAudio.qml
index 8d1099d38c..d135dda3c6 100644
--- a/interface/resources/qml/hifi/audio/LoopbackAudio.qml
+++ b/interface/resources/qml/hifi/audio/LoopbackAudio.qml
@@ -60,11 +60,11 @@ RowLayout {
         }
     }
 
-    RalewayRegular {
-        Layout.leftMargin: 2;
-        size: 14;
-        color: "white";
-        font.italic: true
-        text: audioLoopedBack ? qsTr("Speak in your input") : "";
-    }
+//    RalewayRegular {
+//        Layout.leftMargin: 2;
+//        size: 14;
+//        color: "white";
+//        font.italic: true
+//        text: audioLoopedBack ? qsTr("Speak in your input") : "";
+//    }
 }
diff --git a/interface/resources/qml/hifi/audio/PlaySampleSound.qml b/interface/resources/qml/hifi/audio/PlaySampleSound.qml
index 4675f6087a..033af99d04 100644
--- a/interface/resources/qml/hifi/audio/PlaySampleSound.qml
+++ b/interface/resources/qml/hifi/audio/PlaySampleSound.qml
@@ -64,11 +64,11 @@ RowLayout {
         height: 32;
     }
 
-    RalewayRegular {
-        Layout.leftMargin: 2;
-        size: 14;
-        color: "white";
-        font.italic: true
-        text: isPlaying ? qsTr("Listen to your output") : "";
-    }
+//    RalewayRegular {
+//        Layout.leftMargin: 2;
+//        size: 14;
+//        color: "white";
+//        font.italic: true
+//        text: isPlaying ? qsTr("Listen to your output") : "";
+//    }
 }
diff --git a/libraries/audio-client/src/AudioClient.cpp b/libraries/audio-client/src/AudioClient.cpp
index 9fa9a0bc18..2f3eb7711f 100644
--- a/libraries/audio-client/src/AudioClient.cpp
+++ b/libraries/audio-client/src/AudioClient.cpp
@@ -1368,9 +1368,9 @@ bool AudioClient::mixLocalAudioInjectors(float* mixBuffer) {
             memset(_localScratchBuffer, 0, bytesToRead);
             if (0 < injectorBuffer->readData((char*)_localScratchBuffer, bytesToRead)) {
 
-                bool isSystemSound = !injector->isPositionSet() && !injector->isAmbisonic();
+                bool isSystemSound = !options.positionSet && !options.ambisonic;
 
-                float gain = injector->getVolume() * (isSystemSound ? _systemInjectorGain : _localInjectorGain);
+                float gain = options.volume * (isSystemSound ? _systemInjectorGain : _localInjectorGain);
 
                 if (options.ambisonic) {