diff --git a/libavformat/samidec.c b/libavformat/samidec.c
index 8f97cb7331..c23335cf4d 100644
--- a/libavformat/samidec.c
+++ b/libavformat/samidec.c
@@ -115,8 +115,6 @@ static int sami_read_header(AVFormatContext *s)
     ff_subtitles_queue_finalize(s, &sami->q);
 
 end:
-    if (res < 0)
-        ff_subtitles_queue_clean(&sami->q);
     av_bprint_finalize(&buf, NULL);
     return res;
 }
@@ -146,6 +144,7 @@ const AVInputFormat ff_sami_demuxer = {
     .name           = "sami",
     .long_name      = NULL_IF_CONFIG_SMALL("SAMI subtitle format"),
     .priv_data_size = sizeof(SAMIContext),
+    .flags_internal = FF_FMT_INIT_CLEANUP,
     .read_probe     = sami_probe,
     .read_header    = sami_read_header,
     .read_packet    = sami_read_packet,