diff --git a/libraries/audio-client/src/AudioClient.cpp b/libraries/audio-client/src/AudioClient.cpp
index cc573954ad..1aa4439de9 100644
--- a/libraries/audio-client/src/AudioClient.cpp
+++ b/libraries/audio-client/src/AudioClient.cpp
@@ -1135,8 +1135,9 @@ void AudioClient::mixLocalAudioInjectors(float* mixBuffer) {
                 } else if (injector->isStereo()) {
 
                     // stereo gets directly mixed into mixBuffer
+                    float gain = injector->getVolume();
                     for (int i = 0; i < AudioConstants::NETWORK_FRAME_SAMPLES_STEREO; i++) {
-                        mixBuffer[i] += (float)_scratchBuffer[i] * (1/32768.0f);
+                        mixBuffer[i] += (float)_scratchBuffer[i] * (1/32768.0f) * gain;
                     }
                     
                 } else {
diff --git a/libraries/audio/src/AudioInjector.cpp b/libraries/audio/src/AudioInjector.cpp
index d98d4108ce..3255f8c1eb 100644
--- a/libraries/audio/src/AudioInjector.cpp
+++ b/libraries/audio/src/AudioInjector.cpp
@@ -166,7 +166,6 @@ bool AudioInjector::injectLocally() {
 
             _localBuffer->open(QIODevice::ReadOnly);
             _localBuffer->setShouldLoop(_options.loop);
-            _localBuffer->setVolume(_options.volume);
 
             // give our current send position to the local buffer
             _localBuffer->setCurrentOffset(_currentSendOffset);
diff --git a/libraries/audio/src/AudioInjector.h b/libraries/audio/src/AudioInjector.h
index 2abc445034..c5e741365a 100644
--- a/libraries/audio/src/AudioInjector.h
+++ b/libraries/audio/src/AudioInjector.h
@@ -63,7 +63,7 @@ public:
     AudioFOA& getLocalFOA() { return _localFOA; }
 
     bool isLocalOnly() const { return _options.localOnly; }
-    float getVolume() const { return _options.volume; }
+    float getVolume() const { return glm::clamp(_options.volume, 0.0f, 1.0f); }
     glm::vec3 getPosition() const { return _options.position; }
     glm::quat getOrientation() const { return _options.orientation; }
     bool isStereo() const { return _options.stereo; }
diff --git a/libraries/audio/src/AudioInjectorLocalBuffer.cpp b/libraries/audio/src/AudioInjectorLocalBuffer.cpp
index 27e93a678e..049adb0cc6 100644
--- a/libraries/audio/src/AudioInjectorLocalBuffer.cpp
+++ b/libraries/audio/src/AudioInjectorLocalBuffer.cpp
@@ -16,8 +16,7 @@ AudioInjectorLocalBuffer::AudioInjectorLocalBuffer(const QByteArray& rawAudioArr
     _rawAudioArray(rawAudioArray),
     _shouldLoop(false),
     _isStopped(false),
-    _currentOffset(0),
-    _volume(1.0f)
+    _currentOffset(0)
 {
     
 }
@@ -36,17 +35,6 @@ bool AudioInjectorLocalBuffer::seek(qint64 pos) {
     }
 }
 
-void copy(char* to, char* from, int size, qreal factor) {
-    int16_t* toArray = (int16_t*) to;
-    int16_t* fromArray = (int16_t*) from;
-    int sampleSize = size / sizeof(int16_t);
-    
-    for (int i = 0; i < sampleSize; i++) {
-        *toArray = factor * (*fromArray);
-        toArray++;
-        fromArray++;
-    }
-}
 
 qint64 AudioInjectorLocalBuffer::readData(char* data, qint64 maxSize) {
     if (!_isStopped) {
@@ -60,7 +48,7 @@ qint64 AudioInjectorLocalBuffer::readData(char* data, qint64 maxSize) {
             bytesRead = bytesToEnd;
         }
         
-        copy(data, _rawAudioArray.data() + _currentOffset, bytesRead, _volume);
+        memcpy(data, _rawAudioArray.data() + _currentOffset, bytesRead);
         
         // now check if we are supposed to loop and if we can copy more from the beginning
         if (_shouldLoop && maxSize != bytesRead) {
@@ -88,7 +76,7 @@ qint64 AudioInjectorLocalBuffer::recursiveReadFromFront(char* data, qint64 maxSi
     }
     
     // copy that amount
-    copy(data, _rawAudioArray.data(), bytesRead, _volume);
+    memcpy(data, _rawAudioArray.data(), bytesRead);
     
     // check if we need to call ourselves again and pull from the front again
     if (bytesRead < maxSize) {
@@ -97,4 +85,4 @@ qint64 AudioInjectorLocalBuffer::recursiveReadFromFront(char* data, qint64 maxSi
         _currentOffset = bytesRead;
         return bytesRead;
     }
-}
\ No newline at end of file
+}
diff --git a/libraries/audio/src/AudioInjectorLocalBuffer.h b/libraries/audio/src/AudioInjectorLocalBuffer.h
index 988b622ce7..07d8ae5b9f 100644
--- a/libraries/audio/src/AudioInjectorLocalBuffer.h
+++ b/libraries/audio/src/AudioInjectorLocalBuffer.h
@@ -30,7 +30,6 @@ public:
 
     void setShouldLoop(bool shouldLoop) { _shouldLoop = shouldLoop; }
     void setCurrentOffset(int currentOffset) { _currentOffset = currentOffset; }
-    void setVolume(float volume) { _volume = glm::clamp(volume, 0.0f, 1.0f); }
 
 private:
     qint64 recursiveReadFromFront(char* data, qint64 maxSize);
@@ -40,7 +39,6 @@ private:
     bool _isStopped;
 
     int _currentOffset;
-    float _volume;
 };
 
 #endif // hifi_AudioInjectorLocalBuffer_h