diff --git a/interface/src/Audio.cpp b/interface/src/Audio.cpp
index f49d16675c..fde16737a2 100644
--- a/interface/src/Audio.cpp
+++ b/interface/src/Audio.cpp
@@ -47,6 +47,18 @@
 
 static const int RECEIVED_AUDIO_STREAM_CAPACITY_FRAMES = 100;
 
+Setting::Handle<bool> dynamicJitterBuffers("dynamicJitterBuffers", DEFAULT_DYNAMIC_JITTER_BUFFERS);
+Setting::Handle<int> maxFramesOverDesired("maxFramesOverDesired", DEFAULT_MAX_FRAMES_OVER_DESIRED);
+Setting::Handle<int> staticDesiredJitterBufferFrames("staticDesiredJitterBufferFrames",
+                                                     DEFAULT_STATIC_DESIRED_JITTER_BUFFER_FRAMES);
+Setting::Handle<bool> useStDevForJitterCalc("useStDevForJitterCalc", DEFAULT_USE_STDEV_FOR_JITTER_CALC);
+Setting::Handle<int> windowStarveThreshold("windowStarveThreshold", DEFAULT_WINDOW_STARVE_THRESHOLD);
+Setting::Handle<int> windowSecondsForDesiredCalcOnTooManyStarves("windowSecondsForDesiredCalcOnTooManyStarves",
+                                                                 DEFAULT_WINDOW_SECONDS_FOR_DESIRED_CALC_ON_TOO_MANY_STARVES);
+Setting::Handle<int> windowSecondsForDesiredReduction("windowSecondsForDesiredReduction",
+                                                      DEFAULT_WINDOW_SECONDS_FOR_DESIRED_REDUCTION);
+Setting::Handle<bool> repetitionWithFade("repetitionWithFade", DEFAULT_REPETITION_WITH_FADE);
+
 Audio::Audio() :
     AbstractAudioInterface(),
     _audioInput(NULL),
@@ -1126,10 +1138,25 @@ void Audio::checkDevices() {
 }
 
 void Audio::loadSettings() {
-    _receivedAudioStream.loadSettings();
+    _receivedAudioStream.setDynamicJitterBuffers(dynamicJitterBuffers.get());
+    _receivedAudioStream.setMaxFramesOverDesired(maxFramesOverDesired.get());
+    _receivedAudioStream.setStaticDesiredJitterBufferFrames(staticDesiredJitterBufferFrames.get());
+    _receivedAudioStream.setUseStDevForJitterCalc(useStDevForJitterCalc.get());
+    _receivedAudioStream.setWindowStarveThreshold(windowStarveThreshold.get());
+    _receivedAudioStream.setWindowSecondsForDesiredCalcOnTooManyStarves(
+                                            windowSecondsForDesiredCalcOnTooManyStarves.get());
+    _receivedAudioStream.setWindowSecondsForDesiredReduction(windowSecondsForDesiredReduction.get());
+    _receivedAudioStream.setRepetitionWithFade(repetitionWithFade.get());
 }
 
 void Audio::saveSettings() {
-    _receivedAudioStream.saveSettings();
+    dynamicJitterBuffers.set(_receivedAudioStream.getDynamicJitterBuffers());
+    maxFramesOverDesired.set(_receivedAudioStream.getMaxFramesOverDesired());
+    staticDesiredJitterBufferFrames.set(_receivedAudioStream.getDesiredJitterBufferFrames());
+    windowStarveThreshold.set(_receivedAudioStream.getWindowStarveThreshold());
+    windowSecondsForDesiredCalcOnTooManyStarves.set(_receivedAudioStream.
+                                            getWindowSecondsForDesiredCalcOnTooManyStarves());
+    windowSecondsForDesiredReduction.set(_receivedAudioStream.getWindowSecondsForDesiredReduction());
+    repetitionWithFade.set(_receivedAudioStream.getRepetitionWithFade());
 }
 
diff --git a/libraries/audio/src/InboundAudioStream.cpp b/libraries/audio/src/InboundAudioStream.cpp
index be7a38853e..3c9033494a 100644
--- a/libraries/audio/src/InboundAudioStream.cpp
+++ b/libraries/audio/src/InboundAudioStream.cpp
@@ -11,26 +11,11 @@
 
 #include <glm/glm.hpp>
 
-#include <SettingHandle.h>
-
 #include "InboundAudioStream.h"
 #include "PacketHeaders.h"
 
 const int STARVE_HISTORY_CAPACITY = 50;
 
-Setting::Handle<bool> dynamicJitterBuffers("dynamicJitterBuffers", DEFAULT_DYNAMIC_JITTER_BUFFERS);
-Setting::Handle<int> maxFramesOverDesired("maxFramesOverDesired", DEFAULT_MAX_FRAMES_OVER_DESIRED);
-Setting::Handle<int> staticDesiredJitterBufferFrames("staticDesiredJitterBufferFrames",
-                                                     DEFAULT_STATIC_DESIRED_JITTER_BUFFER_FRAMES);
-Setting::Handle<bool> useStDevForJitterCalc("useStDevForJitterCalc", DEFAULT_USE_STDEV_FOR_JITTER_CALC);
-Setting::Handle<int> windowStarveThreshold("windowStarveThreshold", DEFAULT_WINDOW_STARVE_THRESHOLD);
-Setting::Handle<int> windowSecondsForDesiredCalcOnTooManyStarves("windowSecondsForDesiredCalcOnTooManyStarves",
-                                                    DEFAULT_WINDOW_SECONDS_FOR_DESIRED_CALC_ON_TOO_MANY_STARVES);
-Setting::Handle<int> windowSecondsForDesiredReduction("windowSecondsForDesiredReduction",
-                                                      DEFAULT_WINDOW_SECONDS_FOR_DESIRED_REDUCTION);
-Setting::Handle<bool> repetitionWithFade("repetitionWithFade", DEFAULT_REPETITION_WITH_FADE);
-
-
 InboundAudioStream::InboundAudioStream(int numFrameSamples, int numFramesCapacity, const Settings& settings) :
     _ringBuffer(numFrameSamples, false, numFramesCapacity),
     _lastPopSucceeded(false),
@@ -516,27 +501,3 @@ float calculateRepeatedFrameFadeFactor(int indexOfRepeat) {
     return 0.0f;
 }
 
-void InboundAudioStream::loadSettings() {
-    setDynamicJitterBuffers(dynamicJitterBuffers.get());
-    setMaxFramesOverDesired(maxFramesOverDesired.get());
-    setStaticDesiredJitterBufferFrames(staticDesiredJitterBufferFrames.get());
-    setUseStDevForJitterCalc(useStDevForJitterCalc.get());
-    setWindowStarveThreshold(windowStarveThreshold.get());
-    setWindowSecondsForDesiredCalcOnTooManyStarves(windowSecondsForDesiredCalcOnTooManyStarves.get());
-    setWindowSecondsForDesiredReduction(windowSecondsForDesiredReduction.get());
-    setRepetitionWithFade(repetitionWithFade.get());
-}
-
-void InboundAudioStream::saveSettings() {
-    dynamicJitterBuffers.set(getDynamicJitterBuffers());
-    maxFramesOverDesired.set(getMaxFramesOverDesired());
-    staticDesiredJitterBufferFrames.set(getDesiredJitterBufferFrames());
-    useStDevForJitterCalc.set(getUseStDevForJitterCalc());
-    windowStarveThreshold.set(getWindowStarveThreshold());
-    windowSecondsForDesiredCalcOnTooManyStarves.set(getWindowSecondsForDesiredCalcOnTooManyStarves());
-    windowSecondsForDesiredReduction.set(getWindowSecondsForDesiredReduction());
-    repetitionWithFade.set(getRepetitionWithFade());
-}
-
-
-
diff --git a/libraries/audio/src/InboundAudioStream.h b/libraries/audio/src/InboundAudioStream.h
index 4e75602fe8..99039b5482 100644
--- a/libraries/audio/src/InboundAudioStream.h
+++ b/libraries/audio/src/InboundAudioStream.h
@@ -126,9 +126,6 @@ public:
     void setWindowSecondsForDesiredReduction(int windowSecondsForDesiredReduction);
     void setRepetitionWithFade(bool repetitionWithFade) { _repetitionWithFade = repetitionWithFade; }
 
-    void loadSettings();
-    void saveSettings();
-
     virtual AudioStreamStats getAudioStreamStats() const;
 
     /// returns the desired number of jitter buffer frames under the dyanmic jitter buffers scheme