diff --git a/app/src/main/java/com/limelight/binding/video/MediaCodecDecoderRenderer.java b/app/src/main/java/com/limelight/binding/video/MediaCodecDecoderRenderer.java
index f5eca790..9b2d2be0 100644
--- a/app/src/main/java/com/limelight/binding/video/MediaCodecDecoderRenderer.java
+++ b/app/src/main/java/com/limelight/binding/video/MediaCodecDecoderRenderer.java
@@ -321,13 +321,16 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
         rendererThread.start();
     }
 
-    private int dequeueInputBuffer(boolean wait, boolean infiniteWait) {
-        int index;
+    private int dequeueInputBuffer() {
+        int index = -1;
         long startTime, queueTime;
 
         startTime = MediaCodecHelper.getMonotonicMillis();
 
-        index = videoDecoder.dequeueInputBuffer(wait ? (infiniteWait ? -1 : 3000) : 0);
+        while (!rendererThread.isInterrupted() && index < 0) {
+            index = videoDecoder.dequeueInputBuffer(500);
+        }
+
         if (index < 0) {
             return index;
         }
@@ -430,7 +433,12 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
         }
         lastTimestampUs = timestampUs;
 
-        int inputBufferIndex = dequeueInputBuffer(true, false);
+        int inputBufferIndex = dequeueInputBuffer();
+        if (inputBufferIndex < 0) {
+            // We're being torn down now
+            return MoonBridge.DR_OK;
+        }
+
         ByteBuffer buf = getEmptyInputBuffer(inputBufferIndex);
 
         int codecFlags = 0;
@@ -582,7 +590,7 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
     }
 
     private void replaySps() {
-        int inputIndex = dequeueInputBuffer(true, true);
+        int inputIndex = dequeueInputBuffer();
         ByteBuffer inputBuffer = getEmptyInputBuffer(inputIndex);
 
         // Write the Annex B header
diff --git a/moonlight-common b/moonlight-common
index bdaed571..67d9f52b 160000
--- a/moonlight-common
+++ b/moonlight-common
@@ -1 +1 @@
-Subproject commit bdaed5712289ba1878f646e7b3d5ddd5332dcae6
+Subproject commit 67d9f52b6d3a72137f7f2fbbc81fa707befa72a5