diff --git a/src/xenia/apu/xma_context_new.cc b/src/xenia/apu/xma_context_new.cc
index 3480bd563..f17adfda3 100644
--- a/src/xenia/apu/xma_context_new.cc
+++ b/src/xenia/apu/xma_context_new.cc
@@ -219,10 +219,9 @@ bool XmaContextNew::Work() {
   }
 
   // Signal the game that the output buffer is full
-  if (remaining_subframe_blocks_in_output_buffer_ == 0) {
+  if (remaining_subframe_blocks_in_output_buffer_ == 0 && output_rb.empty()) {
     XELOGAPU("XmaContext {}: Output ring buffer is full, invalidating output",
              id());
-    data.output_buffer_write_offset = data.output_buffer_read_offset;
     data.output_buffer_valid = 0;
   }