diff --git a/media/libaaudio/src/client/AudioStreamInternalCapture.cpp b/media/libaaudio/src/client/AudioStreamInternalCapture.cpp
index 7d7b4ef..d9b75da 100644
--- a/media/libaaudio/src/client/AudioStreamInternalCapture.cpp
+++ b/media/libaaudio/src/client/AudioStreamInternalCapture.cpp
@@ -214,6 +214,8 @@
         int32_t framesAvailableInWrappingBuffer = totalFramesInWrappingBuffer;
         uint8_t *currentWrappingBuffer = (uint8_t *) wrappingBuffer.data[partIndex];
 
+        if (framesAvailableInWrappingBuffer <= 0) break;
+
         // Put data from the wrapping buffer into the flowgraph 8 frames at a time.
         // Continuously pull as much data as possible from the flowgraph into the byte buffer.
         // The return value of mFlowGraph.process is the number of frames actually pulled.
diff --git a/media/libaaudio/src/client/AudioStreamInternalPlay.cpp b/media/libaaudio/src/client/AudioStreamInternalPlay.cpp
index ac927ae..3badb0b 100644
--- a/media/libaaudio/src/client/AudioStreamInternalPlay.cpp
+++ b/media/libaaudio/src/client/AudioStreamInternalPlay.cpp
@@ -258,14 +258,20 @@
             currentWrappingBuffer += numBytesActuallyWrittenToWrappingBuffer;
             framesAvailableInWrappingBuffer -= framesActuallyWrittenToWrappingBuffer;
             framesWrittenToAudioEndpoint += framesActuallyWrittenToWrappingBuffer;
+        } else {
+            break;
         }
 
         // Put data from byteBuffer into the flowgraph one buffer (8 frames) at a time.
         // Continuously pull as much data as possible from the flowgraph into the wrapping buffer.
         // The return value of mFlowGraph.process is the number of frames actually pulled.
         while (framesAvailableInWrappingBuffer > 0 && framesLeftInByteBuffer > 0) {
-            const int32_t framesToWriteFromByteBuffer = std::min(flowgraph::kDefaultBufferSize,
+            int32_t framesToWriteFromByteBuffer = std::min(flowgraph::kDefaultBufferSize,
                     framesLeftInByteBuffer);
+            // If the wrapping buffer is running low, write one frame at a time.
+            if (framesAvailableInWrappingBuffer < flowgraph::kDefaultBufferSize) {
+                framesToWriteFromByteBuffer = 1;
+            }
 
             const int32_t numBytesToWriteFromByteBuffer = getBytesPerFrame() *
                     framesToWriteFromByteBuffer;