diff --git a/stream-webrtc-android/src/main/java/org/webrtc/AndroidVideoDecoder.java b/stream-webrtc-android/src/main/java/org/webrtc/AndroidVideoDecoder.java
index 47cb5689c..efd11db62 100644
--- a/stream-webrtc-android/src/main/java/org/webrtc/AndroidVideoDecoder.java
+++ b/stream-webrtc-android/src/main/java/org/webrtc/AndroidVideoDecoder.java
@@ -303,7 +303,6 @@ public VideoCodecStatus release() {
       renderedTextureMetadata = null;
     }
     callback = null;
-    frameInfos.clear();
     return status;
   }
 
@@ -331,6 +330,7 @@ private VideoCodecStatus releaseInternal() {
     } finally {
       codec = null;
       outputThread = null;
+      frameInfos.clear();
     }
     return VideoCodecStatus.OK;
   }
@@ -422,7 +422,6 @@ private void deliverTextureFrame(final int index, final MediaCodec.BufferInfo in
 
   @Override
   public void onFrame(VideoFrame frame) {
-    final VideoFrame newFrame;
     final Integer decodeTimeMs;
     final long timestampNs;
     synchronized (renderedTextureMetadataLock) {