diff --git a/app/src/demuxer.c b/app/src/demuxer.c
index c9ee8f3c45..c27ea29238 100644
--- a/app/src/demuxer.c
+++ b/app/src/demuxer.c
@@ -227,8 +227,9 @@ run_demuxer(void *data) {
     }
 
     // Config packets must be merged with the next non-config packet only for
-    // video streams
-    bool must_merge_config_packet = codec->type == AVMEDIA_TYPE_VIDEO;
+    // H.26x
+    bool must_merge_config_packet = raw_codec_id == SC_CODEC_ID_H264
+                                 || raw_codec_id == SC_CODEC_ID_H265;
 
     struct sc_packet_merger merger;