diff --git a/modules/video_coding/packet_buffer.cc b/modules/video_coding/packet_buffer.cc
index b6fc521..fb25c0ad 100644
--- a/modules/video_coding/packet_buffer.cc
+++ b/modules/video_coding/packet_buffer.cc
@@ -123,8 +123,11 @@
 
   int64_t now_ms = clock_->TimeInMilliseconds();
   last_received_packet_ms_ = now_ms;
-  if (packet->video_header.frame_type == VideoFrameType::kVideoFrameKey)
+  if (packet->video_header.frame_type == VideoFrameType::kVideoFrameKey ||
+      last_received_keyframe_rtp_timestamp_ == packet->timestamp) {
     last_received_keyframe_packet_ms_ = now_ms;
+    last_received_keyframe_rtp_timestamp_ = packet->timestamp;
+  }
 
   StoredPacket& new_entry = buffer_[index];
   new_entry.continuous = false;
diff --git a/modules/video_coding/packet_buffer.h b/modules/video_coding/packet_buffer.h
index 8371a37..939168d 100644
--- a/modules/video_coding/packet_buffer.h
+++ b/modules/video_coding/packet_buffer.h
@@ -160,10 +160,12 @@
   // determine continuity between them.
   std::vector<StoredPacket> buffer_ RTC_GUARDED_BY(crit_);
 
-  // Timestamp (not RTP timestamp) of the last received packet/keyframe packet.
+  // Timestamp of the last received packet/keyframe packet.
   absl::optional<int64_t> last_received_packet_ms_ RTC_GUARDED_BY(crit_);
   absl::optional<int64_t> last_received_keyframe_packet_ms_
       RTC_GUARDED_BY(crit_);
+  absl::optional<uint32_t> last_received_keyframe_rtp_timestamp_
+      RTC_GUARDED_BY(crit_);
 
   absl::optional<uint16_t> newest_inserted_seq_num_ RTC_GUARDED_BY(crit_);
   std::set<uint16_t, DescendingSeqNumComp<uint16_t>> missing_packets_
diff --git a/modules/video_coding/packet_buffer_unittest.cc b/modules/video_coding/packet_buffer_unittest.cc
index 980ac35..0936bf8 100644
--- a/modules/video_coding/packet_buffer_unittest.cc
+++ b/modules/video_coding/packet_buffer_unittest.cc
@@ -755,7 +755,7 @@
   EXPECT_FALSE(packet_keyframe_ms);
 
   int64_t keyframe_ms = clock_.TimeInMilliseconds();
-  Insert(100, kKeyFrame, kFirst, kLast);
+  Insert(100, kKeyFrame, kFirst, kLast, {}, /*timestamp=*/1000);
   packet_ms = packet_buffer_.LastReceivedPacketMs();
   packet_keyframe_ms = packet_buffer_.LastReceivedKeyframePacketMs();
   EXPECT_TRUE(packet_ms);
@@ -765,7 +765,7 @@
 
   clock_.AdvanceTimeMilliseconds(100);
   int64_t delta_ms = clock_.TimeInMilliseconds();
-  Insert(101, kDeltaFrame, kFirst, kLast);
+  Insert(101, kDeltaFrame, kFirst, kLast, {}, /*timestamp=*/2000);
   packet_ms = packet_buffer_.LastReceivedPacketMs();
   packet_keyframe_ms = packet_buffer_.LastReceivedKeyframePacketMs();
   EXPECT_TRUE(packet_ms);
@@ -780,6 +780,32 @@
   EXPECT_FALSE(packet_keyframe_ms);
 }
 
+TEST_F(PacketBufferTest,
+       LastReceivedKeyFrameReturnsReceiveTimeOfALastReceivedPacketOfAKeyFrame) {
+  clock_.AdvanceTimeMilliseconds(100);
+  Insert(/*seq_num=*/100, kKeyFrame, kFirst, kNotLast, {}, /*timestamp=*/1000);
+  EXPECT_EQ(packet_buffer_.LastReceivedKeyframePacketMs(),
+            clock_.TimeInMilliseconds());
+
+  clock_.AdvanceTimeMilliseconds(100);
+  Insert(/*seq_num=*/102, kDeltaFrame, kNotFirst, kLast, {},
+         /*timestamp=*/1000);
+  EXPECT_EQ(packet_buffer_.LastReceivedKeyframePacketMs(),
+            clock_.TimeInMilliseconds());
+
+  clock_.AdvanceTimeMilliseconds(100);
+  Insert(/*seq_num=*/101, kDeltaFrame, kNotFirst, kNotLast, {},
+         /*timestamp=*/1000);
+  EXPECT_EQ(packet_buffer_.LastReceivedKeyframePacketMs(),
+            clock_.TimeInMilliseconds());
+
+  clock_.AdvanceTimeMilliseconds(100);
+  Insert(/*seq_num=*/103, kDeltaFrame, kFirst, kNotLast, {},
+         /*timestamp=*/2000);
+  EXPECT_EQ(packet_buffer_.LastReceivedKeyframePacketMs(),
+            clock_.TimeInMilliseconds() - 100);
+}
+
 TEST_F(PacketBufferTest, IncomingCodecChange) {
   PacketBuffer::Packet packet;
   packet.video_header.is_first_packet_in_frame = true;