diff --git a/moonlight-common/src/com/limelight/nvstream/av/video/VideoDepacketizer.java b/moonlight-common/src/com/limelight/nvstream/av/video/VideoDepacketizer.java
index 8cfdba5a..61d8a1d2 100644
--- a/moonlight-common/src/com/limelight/nvstream/av/video/VideoDepacketizer.java
+++ b/moonlight-common/src/com/limelight/nvstream/av/video/VideoDepacketizer.java
@@ -107,6 +107,15 @@ public class VideoDepacketizer {
 	{
 		ByteBufferDescriptor location = packet.getNewPayloadDescriptor();
 
+		if (location.length == 968) {
+			if (packet.getPacketIndex() < packet.getTotalPackets()) {
+				location.length = packet.getPayloadLength();
+			}
+			else {
+				return;
+			}
+		}
+		
 		while (location.length != 0)
 		{
 			// Remember the start of the NAL data in this packet