diff --git a/libavcodec/apac.c b/libavcodec/apac.c
index e9f6a0dd88..784abb622c 100644
--- a/libavcodec/apac.c
+++ b/libavcodec/apac.c
@@ -196,10 +196,14 @@ static int apac_decode(AVCodecContext *avctx, AVFrame *frame,
                 return AVERROR_INVALIDDATA;
             }
 
-            if (get_bits_left(gb) < c->block_length * c->bit_length && pkt->size) {
-                c->have_code = 1;
-                s->cur_ch = ch;
-                goto end;
+            if (get_bits_left(gb) < c->block_length * c->bit_length) {
+                if (pkt->size) {
+                    c->have_code = 1;
+                    s->cur_ch = ch;
+                    goto end;
+                } else {
+                    break;
+                }
             }
 
             for (int i = 0; i < c->block_length; i++) {