diff --git a/moonlight-common/src/com/limelight/nvstream/av/audio/AudioDepacketizer.java b/moonlight-common/src/com/limelight/nvstream/av/audio/AudioDepacketizer.java
index 7ace51c9..1002589c 100644
--- a/moonlight-common/src/com/limelight/nvstream/av/audio/AudioDepacketizer.java
+++ b/moonlight-common/src/com/limelight/nvstream/av/audio/AudioDepacketizer.java
@@ -46,7 +46,6 @@ public class AudioDepacketizer {
 		else {
 			pcmData = pcmRing[ringIndex];
 			decodeLen = OpusDecoder.decode(data, off, len, pcmData);
-			ringIndex = (ringIndex + 1) % DU_LIMIT;
 		}
 		
 		if (decodeLen > 0) {
@@ -61,6 +60,10 @@ public class AudioDepacketizer {
 				// Clear out the queue
 				decodedUnits.clear();
 			}
+			else {
+				// Frame successfully submitted for playback
+				ringIndex = (ringIndex + 1) % DU_LIMIT;
+			}
 		}
 	}