diff --git a/webrtc/video_engine/vie_channel_manager.cc b/webrtc/video_engine/vie_channel_manager.cc
index beda55f45..42ae65642 100644
--- a/webrtc/video_engine/vie_channel_manager.cc
+++ b/webrtc/video_engine/vie_channel_manager.cc
@@ -403,6 +403,9 @@ void ViEChannelManager::UpdateSsrcs(int channel_id,
 
   EncoderStateFeedback* encoder_state_feedback =
       channel_group->GetEncoderStateFeedback();
+  // Remove a possible previous setting for this encoder before adding the new
+  // setting.
+  encoder_state_feedback->RemoveEncoder(encoder);
   for (std::list<unsigned int>::const_iterator it = ssrcs.begin();
        it != ssrcs.end(); ++it) {
     encoder_state_feedback->AddEncoder(*it, encoder);