diff --git a/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc b/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc
index 33e23ec01a..09be51811f 100644
--- a/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc
@@ -291,6 +291,7 @@ void ModuleRtpRtcpImpl::SetSequenceNumber(const uint16_t seq_num) {
 bool ModuleRtpRtcpImpl::SetRtpStateForSsrc(uint32_t ssrc,
                                            const RtpState& rtp_state) {
   if (rtp_sender_.SSRC() == ssrc) {
+    SetStartTimestamp(rtp_state.start_timestamp);
     rtp_sender_.SetRtpState(rtp_state);
     return true;
   }
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_sender.cc b/webrtc/modules/rtp_rtcp/source/rtp_sender.cc
index bd9314d5d7..f2d45eb4c8 100644
--- a/webrtc/modules/rtp_rtcp/source/rtp_sender.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtp_sender.cc
@@ -1872,7 +1872,6 @@ uint32_t RTPSender::BitrateSent() const {
 }
 
 void RTPSender::SetRtpState(const RtpState& rtp_state) {
-  SetStartTimestamp(rtp_state.start_timestamp, true);
   CriticalSectionScoped lock(send_critsect_.get());
   sequence_number_ = rtp_state.sequence_number;
   sequence_number_forced_ = true;