diff --git a/libavcodec/cbs_apv_syntax_template.c b/libavcodec/cbs_apv_syntax_template.c
index ca66349141..fc8a08ff31 100644
--- a/libavcodec/cbs_apv_syntax_template.c
+++ b/libavcodec/cbs_apv_syntax_template.c
@@ -543,11 +543,11 @@ static int FUNC(metadata)(CodedBitstreamContext *ctx, RWContext *rw,
             return AVERROR_INVALIDDATA;
         }
 
+        current->metadata_count = p + 1;
+
         CHECK(FUNC(metadata_payload)(ctx, rw, pl));
 
         metadata_bytes_left -= pl->payload_size;
-
-        current->metadata_count = p + 1;
         if (metadata_bytes_left == 0)
             break;
     }