diff --git a/src/xenia/apu/xma_context_new.cc b/src/xenia/apu/xma_context_new.cc
index 9e4ac02c5..2de68863f 100644
--- a/src/xenia/apu/xma_context_new.cc
+++ b/src/xenia/apu/xma_context_new.cc
@@ -300,17 +300,15 @@ void XmaContextNew::Decode(XMA_CONTEXT_DATA* data) {
     return;
   }
 
-  uint8_t* current_input_buffer = GetCurrentInputBuffer(data);
-
   if (!data->IsCurrentInputBufferValid()) {
-    XELOGE(
-        "XmaContext {}: Invalid current buffer! Selected Buffer: {} Valid: {} "
-        "Pointer: {:08X}",
-        id(), data->current_buffer, data->IsCurrentInputBufferValid(),
-        data->GetCurrentInputBufferAddress());
-    return;
+    SwapInputBuffer(data);
+    if (!data->IsCurrentInputBufferValid()) {
+      return;
+    }
   }
 
+  uint8_t* current_input_buffer = GetCurrentInputBuffer(data);
+
   input_buffer_.fill(0);
 
   UpdateLoopStatus(data);