diff --git a/src/modules/video_coding/main/source/codec_database.cc b/src/modules/video_coding/main/source/codec_database.cc
index 8aa9dd781..51914bcee 100644
--- a/src/modules/video_coding/main/source/codec_database.cc
+++ b/src/modules/video_coding/main/source/codec_database.cc
@@ -701,10 +701,9 @@ VCMCodecDataBase::CopyDecoder(const VCMGenericDecoder& decoder)
         ReleaseDecoder(_ptrDecoder);
         _ptrDecoder = new VCMGenericDecoder(*decoderCopy, _id,
                                             decoder.External());
-        if (cb)
+        if (cb && _ptrDecoder->RegisterDecodeCompleteCallback(cb))
         {
-            WebRtc_Word32 ret = _ptrDecoder->RegisterDecodeCompleteCallback(cb);
-            assert(ret == WEBRTC_VIDEO_CODEC_OK);
+            assert(false);
         }
     }
 }