diff --git a/interface/src/Audio.cpp b/interface/src/Audio.cpp
index 3fa1d6a082..ae4caa76f5 100644
--- a/interface/src/Audio.cpp
+++ b/interface/src/Audio.cpp
@@ -85,8 +85,11 @@ Audio::Audio(int16_t initialJitterBufferSamples, QObject* parent) :
     // slower than real time (or at least the desired sample rate). If you increase the size of the ring buffer, then it 
     // this delay will slowly add up and the longer someone runs, they more delayed their audio will be.
     _inputRingBuffer(0),
+#ifdef _WIN32
+    _ringBuffer(NETWORK_BUFFER_LENGTH_SAMPLES_STEREO, false, 100),
+#else
     _ringBuffer(NETWORK_BUFFER_LENGTH_SAMPLES_STEREO), // DO NOT CHANGE THIS UNLESS YOU SOLVE THE AUDIO DEVICE DRIFT PROBLEM!!!
-    
+#endif  
     _isStereoInput(false),
     _averagedLatency(0.0),
     _measuredJitter(0),
@@ -127,7 +130,8 @@ Audio::Audio(int16_t initialJitterBufferSamples, QObject* parent) :
     _outgoingAvatarAudioSequenceNumber(0),
     _incomingMixedAudioSequenceNumberStats(INCOMING_SEQ_STATS_HISTORY_LENGTH),
     _interframeTimeGapStats(TIME_GAPS_STATS_INTERVAL_SAMPLES, TIME_GAP_STATS_WINDOW_INTERVALS),
-    _framesAvailableStats(1, FRAMES_AVAILABLE_STATS_WINDOW_SECONDS)
+    _ringBufferFramesAvailableStats(1, FRAMES_AVAILABLE_STATS_WINDOW_SECONDS),
+    _audioOutputBufferFramesAvailableStats(1, FRAMES_AVAILABLE_STATS_WINDOW_SECONDS)
 {
     // clear the array of locally injected samples
     memset(_localProceduralSamples, 0, NETWORK_BUFFER_LENGTH_BYTES_PER_CHANNEL);
@@ -790,8 +794,8 @@ AudioStreamStats Audio::getDownstreamAudioStreamStats() const {
     stats._timeGapWindowMax = _interframeTimeGapStats.getWindowMax();
     stats._timeGapWindowAverage = _interframeTimeGapStats.getWindowAverage();
 
-    stats._ringBufferFramesAvailable = getFramesAvailableInRingAndAudioOutputBuffers();
-    stats._ringBufferFramesAvailableAverage = _framesAvailableStats.getWindowAverage();
+    stats._ringBufferFramesAvailable = _ringBuffer.framesAvailable();
+    stats._ringBufferFramesAvailableAverage = _ringBufferFramesAvailableStats.getWindowAverage();
     stats._ringBufferDesiredJitterBufferFrames = getDesiredJitterBufferFrames();
     stats._ringBufferStarveCount = _starveCount;
     stats._ringBufferConsecutiveNotMixedCount = _consecutiveNotMixedCount;
@@ -807,7 +811,8 @@ AudioStreamStats Audio::getDownstreamAudioStreamStats() const {
 void Audio::sendDownstreamAudioStatsPacket() {
 
     // since this function is called every second, we'll sample the number of audio frames available here.
-    _framesAvailableStats.update(getFramesAvailableInRingAndAudioOutputBuffers());
+    _ringBufferFramesAvailableStats.update(_ringBuffer.framesAvailable());
+    _audioOutputBufferFramesAvailableStats.update(getFramesAvailableInAudioOutputBuffer());
 
     // push the current seq number stats into history, which moves the history window forward 1s
     // (since that's how often pushStatsToHistory() is called)
@@ -1613,8 +1618,10 @@ int Audio::calculateNumberOfFrameSamples(int numBytes) {
     return frameSamples;
 }
 
-int Audio::getFramesAvailableInRingAndAudioOutputBuffers() const {
-    int framesInAudioOutputBuffer = (_audioOutput->bufferSize() - _audioOutput->bytesFree()) 
+int Audio::getFramesAvailableInAudioOutputBuffer() const {
+    float networkOutputToOutputRatio = (_desiredOutputFormat.sampleRate() / (float)_outputFormat.sampleRate())
+        * (_desiredOutputFormat.channelCount() / (float)_outputFormat.channelCount());
+
+    return (_audioOutput->bufferSize() - _audioOutput->bytesFree()) * networkOutputToOutputRatio
                                     / (sizeof(int16_t) * _ringBuffer.getNumFrameSamples());
-    return _ringBuffer.framesAvailable() + framesInAudioOutputBuffer;
 }
diff --git a/interface/src/Audio.h b/interface/src/Audio.h
index 0747bdf501..9bc0ecef93 100644
--- a/interface/src/Audio.h
+++ b/interface/src/Audio.h
@@ -79,6 +79,9 @@ public:
 
     const SequenceNumberStats& getIncomingMixedAudioSequenceNumberStats() const { return _incomingMixedAudioSequenceNumberStats; }
 
+    int getFramesAvailableInAudioOutputBuffer() const;
+    int getAverageFramesAvailableInAudioOutputBuffer() const { return (int)_audioOutputBufferFramesAvailableStats.getWindowAverage(); }
+
 public slots:
     void start();
     void stop();
@@ -239,8 +242,6 @@ private:
     void renderGrid(const float* color, int x, int y, int width, int height, int rows, int cols);
     void renderLineStrip(const float* color, int x, int y, int n, int offset, const QByteArray* byteArray);
 
-    int getFramesAvailableInRingAndAudioOutputBuffers() const;
-
     // Audio scope data
     static const unsigned int NETWORK_SAMPLES_PER_FRAME = NETWORK_BUFFER_LENGTH_SAMPLES_PER_CHANNEL;
     static const unsigned int DEFAULT_FRAMES_PER_SCOPE = 5;
@@ -268,7 +269,8 @@ private:
     SequenceNumberStats _incomingMixedAudioSequenceNumberStats;
 
     MovingMinMaxAvg<quint64> _interframeTimeGapStats;
-    MovingMinMaxAvg<int> _framesAvailableStats;
+    MovingMinMaxAvg<int> _ringBufferFramesAvailableStats;
+    MovingMinMaxAvg<int> _audioOutputBufferFramesAvailableStats;
 };
 
 
diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index e65f680d4d..0d46fbd251 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -590,7 +590,7 @@ Menu::Menu() :
                                            Qt::CTRL | Qt::SHIFT | Qt::Key_U,
                                            false);
 
-    addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::DisableQAudioOutputOverflowCheck, 0, false);
+    addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::DisableQAudioOutputOverflowCheck, 0, true);
 
     addActionToQMenuAndActionHash(developerMenu, MenuOption::PasteToVoxel,
                 Qt::CTRL | Qt::SHIFT | Qt::Key_V,
diff --git a/interface/src/Menu.h b/interface/src/Menu.h
index d400a60e2e..e4221b0913 100644
--- a/interface/src/Menu.h
+++ b/interface/src/Menu.h
@@ -348,7 +348,7 @@ namespace MenuOption {
     const QString DisableActivityLogger = "Disable Activity Logger";
     const QString DisableAutoAdjustLOD = "Disable Automatically Adjusting LOD";
     const QString DisableNackPackets = "Disable NACK Packets";
-    const QString DisableQAudioOutputOverflowCheck = "Disable QAudioOutput Overflow Check";
+    const QString DisableQAudioOutputOverflowCheck = "Disable Audio Output Overflow Check";
     const QString DisplayFrustum = "Display Frustum";
     const QString DisplayHands = "Display Hands";
     const QString DisplayHandTargets = "Display Hand Targets";
diff --git a/interface/src/ui/Stats.cpp b/interface/src/ui/Stats.cpp
index a751f43059..aabfe08869 100644
--- a/interface/src/ui/Stats.cpp
+++ b/interface/src/ui/Stats.cpp
@@ -339,10 +339,11 @@ void Stats::display(
 
             AudioStreamStats downstreamAudioStreamStats = audio->getDownstreamAudioStreamStats();
 
-            sprintf(downstreamAudioStatsString, " mix: %.2f%%/%.2f%%, %u/%u/%u", downstreamAudioStreamStats._packetStreamStats.getLostRate()*100.0f,
+            sprintf(downstreamAudioStatsString, " mix: %.2f%%/%.2f%%, %u/%u+%d/%u+%d", downstreamAudioStreamStats._packetStreamStats.getLostRate()*100.0f,
                 downstreamAudioStreamStats._packetStreamWindowStats.getLostRate() * 100.0f,
                 downstreamAudioStreamStats._ringBufferDesiredJitterBufferFrames, downstreamAudioStreamStats._ringBufferFramesAvailableAverage,
-                downstreamAudioStreamStats._ringBufferFramesAvailable);
+                audio->getAverageFramesAvailableInAudioOutputBuffer(),
+                downstreamAudioStreamStats._ringBufferFramesAvailable, audio->getFramesAvailableInAudioOutputBuffer());
 
             verticalOffset += STATS_PELS_PER_LINE;
             drawText(horizontalOffset, verticalOffset, scale, rotation, font, downstreamAudioStatsString, color);