diff --git a/subprojects/gst-plugins-good/ext/adaptivedemux2/gstadaptivedemux-stream.c b/subprojects/gst-plugins-good/ext/adaptivedemux2/gstadaptivedemux-stream.c
index 56a5cf39b4..f5966f5577 100644
--- a/subprojects/gst-plugins-good/ext/adaptivedemux2/gstadaptivedemux-stream.c
+++ b/subprojects/gst-plugins-good/ext/adaptivedemux2/gstadaptivedemux-stream.c
@@ -135,7 +135,7 @@ gst_adaptive_demux2_stream_finalize (GObject * object)
   if (stream->pending_caps)
     gst_caps_unref (stream->pending_caps);
 
-  g_clear_pointer (&stream->pending_tags, gst_tag_list_unref);
+  gst_clear_tag_list (&stream->pending_tags);
   g_clear_pointer (&stream->stream_collection, gst_object_unref);
 
   G_OBJECT_CLASS (parent_class)->finalize (object);
diff --git a/subprojects/gst-plugins-good/ext/adaptivedemux2/gstadaptivedemux.c b/subprojects/gst-plugins-good/ext/adaptivedemux2/gstadaptivedemux.c
index 09385d7675..91161f69d0 100644
--- a/subprojects/gst-plugins-good/ext/adaptivedemux2/gstadaptivedemux.c
+++ b/subprojects/gst-plugins-good/ext/adaptivedemux2/gstadaptivedemux.c
@@ -2833,9 +2833,7 @@ gst_adaptive_demux2_stream_set_tags (GstAdaptiveDemux2Stream * stream,
 {
   GST_DEBUG_OBJECT (stream,
       "setting new tags for stream %" GST_PTR_FORMAT, tags);
-  if (stream->pending_tags) {
-    gst_tag_list_unref (stream->pending_tags);
-  }
+  gst_clear_tag_list (&stream->pending_tags);
   stream->pending_tags = tags;
 }