diff --git a/AUTHORS b/AUTHORS
index 2315b65c60..809628212d 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -58,6 +58,7 @@ Jesús Leganés-Combarro <piranna@gmail.com>
 Jiawei Ou <jiawei.ou@gmail.com>
 Jie Mao <maojie0924@gmail.com>
 Jiwon Kim <jwkim0000@gmail.com>
+Johnny Wong <hellojinqiang@gmail.com>
 Jose Antonio Olivera Ortega <josea.olivera@gmail.com>
 Keiichi Enomoto <enm10k@gmail.com>
 Kiran Thind <kiran.thind@gmail.com>
diff --git a/media/engine/simulcast_encoder_adapter.cc b/media/engine/simulcast_encoder_adapter.cc
index 721ec88a24..a16f04d93e 100644
--- a/media/engine/simulcast_encoder_adapter.cc
+++ b/media/engine/simulcast_encoder_adapter.cc
@@ -159,8 +159,8 @@ SimulcastEncoderAdapter::EncoderContext::EncoderContext(
 
 void SimulcastEncoderAdapter::EncoderContext::Release() {
   if (encoder_) {
-    encoder_->RegisterEncodeCompleteCallback(nullptr);
     encoder_->Release();
+    encoder_->RegisterEncodeCompleteCallback(nullptr);
   }
 }