diff --git a/webrtc/modules/audio_coding/main/acm2/acm_generic_codec.cc b/webrtc/modules/audio_coding/main/acm2/acm_generic_codec.cc
index 0f35fe10f..3a6a6efa2 100644
--- a/webrtc/modules/audio_coding/main/acm2/acm_generic_codec.cc
+++ b/webrtc/modules/audio_coding/main/acm2/acm_generic_codec.cc
@@ -339,8 +339,8 @@ void ACMGenericCodec::ResetAudioEncoder() {
       config.payload_type = codec_inst.pltype;
       enc_dec = new AudioEncoderDecoderIsacFix(config);
     }
-    audio_encoder_.reset(enc_dec);
     decoder_proxy_.SetDecoder(enc_dec);
+    audio_encoder_.reset(enc_dec);
 #endif
 #ifdef WEBRTC_CODEC_ISAC
   } else if (!STR_CASE_CMP(codec_inst.plname, "ISAC")) {
@@ -368,8 +368,8 @@ void ACMGenericCodec::ResetAudioEncoder() {
       config.payload_type = codec_inst.pltype;
       enc_dec = new AudioEncoderDecoderIsac(config);
     }
-    audio_encoder_.reset(enc_dec);
     decoder_proxy_.SetDecoder(enc_dec);
+    audio_encoder_.reset(enc_dec);
 #endif
   } else {
     FATAL();