diff --git a/src/modules/video_coding/codecs/vp8/main/source/vp8.cc b/src/modules/video_coding/codecs/vp8/main/source/vp8.cc
index 24b5a24ead..279666ce16 100644
--- a/src/modules/video_coding/codecs/vp8/main/source/vp8.cc
+++ b/src/modules/video_coding/codecs/vp8/main/source/vp8.cc
@@ -724,10 +724,12 @@ VP8Decoder::InitDecode(const VideoCodec* inst,
     }
 
 #if WEBRTC_LIBVPX_VERSION >= 971
+
     vp8_postproc_cfg_t  ppcfg;
-    ppcfg.post_proc_flag = VP8_DEBLOCK;
+    // Disable deblocking for now due to uninitialized memory being returned.
+    ppcfg.post_proc_flag = 0;
     // Strength of deblocking filter. Valid range:[0,16]
-    ppcfg.deblocking_level = 3;
+    //ppcfg.deblocking_level = 3;
     vpx_codec_control(_decoder, VP8_SET_POSTPROC, &ppcfg);
 #endif
 
diff --git a/src/modules/video_coding/main/source/session_info.cc b/src/modules/video_coding/main/source/session_info.cc
index e7091e2bd2..8855b6c37d 100644
--- a/src/modules/video_coding/main/source/session_info.cc
+++ b/src/modules/video_coding/main/source/session_info.cc
@@ -637,7 +637,6 @@ int VCMSessionInfo::PrepareForDecode(uint8_t* frame_buffer) {
   if (real_data_bytes == 0) {
     // Drop the frame since all it contains are zeros.
     length = 0;
-    packets_.clear();
   }
   return length;
 }