diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c
index 958c9d2f97..1c59ec5937 100644
--- a/libavcodec/aacdec.c
+++ b/libavcodec/aacdec.c
@@ -365,7 +365,7 @@ static void push_output_configuration(AACContext *ac) {
  * configuration is unlocked.
  */
 static void pop_output_configuration(AACContext *ac) {
-    if (ac->oc[1].status != OC_LOCKED) {
+    if (ac->oc[1].status != OC_LOCKED && ac->oc[0].status != OC_NONE) {
         ac->oc[1] = ac->oc[0];
         ac->avctx->channels = ac->oc[1].channels;
         ac->avctx->channel_layout = ac->oc[1].channel_layout;