diff --git a/modules/video_coding/rtp_frame_reference_finder.cc b/modules/video_coding/rtp_frame_reference_finder.cc
index 3d0667f213..6c93c84018 100644
--- a/modules/video_coding/rtp_frame_reference_finder.cc
+++ b/modules/video_coding/rtp_frame_reference_finder.cc
@@ -26,7 +26,6 @@ namespace video_coding {
 RtpFrameReferenceFinder::RtpFrameReferenceFinder(
     OnCompleteFrameCallback* frame_callback)
     : last_picture_id_(-1),
-      last_unwrap_(-1),
       current_ss_idx_(0),
       cleared_to_seq_num_(-1),
       frame_callback_(frame_callback) {}
@@ -167,9 +166,6 @@ RtpFrameReferenceFinder::ManageFrameGeneric(RtpFrameObject* frame,
   // If |picture_id| is specified then we use that to set the frame references,
   // otherwise we use sequence number.
   if (picture_id != kNoPictureId) {
-    if (last_unwrap_ == -1)
-      last_unwrap_ = picture_id;
-
     frame->id.picture_id = unwrapper_.Unwrap(picture_id);
     frame->num_references = frame->frame_type() == kVideoFrameKey ? 0 : 1;
     frame->references[0] = frame->id.picture_id - 1;
@@ -256,9 +252,6 @@ RtpFrameReferenceFinder::FrameDecision RtpFrameReferenceFinder::ManageFrameVp8(
 
   frame->id.picture_id = codec_header.pictureId % kPicIdLength;
 
-  if (last_unwrap_ == -1)
-    last_unwrap_ = codec_header.pictureId;
-
   if (last_picture_id_ == -1)
     last_picture_id_ = frame->id.picture_id;
 
@@ -410,9 +403,6 @@ RtpFrameReferenceFinder::FrameDecision RtpFrameReferenceFinder::ManageFrameVp9(
   frame->inter_layer_predicted = codec_header.inter_layer_predicted;
   frame->id.picture_id = codec_header.picture_id % kPicIdLength;
 
-  if (last_unwrap_ == -1)
-    last_unwrap_ = codec_header.picture_id;
-
   if (last_picture_id_ == -1)
     last_picture_id_ = frame->id.picture_id;
 
diff --git a/modules/video_coding/rtp_frame_reference_finder.h b/modules/video_coding/rtp_frame_reference_finder.h
index 09467cb6f3..501fcbc81a 100644
--- a/modules/video_coding/rtp_frame_reference_finder.h
+++ b/modules/video_coding/rtp_frame_reference_finder.h
@@ -149,10 +149,6 @@ class RtpFrameReferenceFinder {
   std::set<uint16_t, DescendingSeqNumComp<uint16_t>> stashed_padding_
       RTC_GUARDED_BY(crit_);
 
-  // The last unwrapped picture id. Used to unwrap the picture id from a length
-  // of |kPicIdLength| to 16 bits.
-  int last_unwrap_ RTC_GUARDED_BY(crit_);
-
   // Frames earlier than the last received frame that have not yet been
   // fully received.
   std::set<uint16_t, DescendingSeqNumComp<uint16_t, kPicIdLength>>