diff --git a/gst-libs/gst/video/gstvideodecoder.c b/gst-libs/gst/video/gstvideodecoder.c
index 79569f0069..f8a5869549 100644
--- a/gst-libs/gst/video/gstvideodecoder.c
+++ b/gst-libs/gst/video/gstvideodecoder.c
@@ -1425,6 +1425,8 @@ gst_video_decoder_sink_event_default (GstVideoDecoder * decoder,
         gst_event_unref (event);
         event = gst_video_decoder_create_merged_tags_event (decoder);
         GST_VIDEO_DECODER_STREAM_UNLOCK (decoder);
+        if (!event)
+          ret = TRUE;
       }
       break;
     }
diff --git a/gst-libs/gst/video/gstvideoencoder.c b/gst-libs/gst/video/gstvideoencoder.c
index 8b52b1abee..c45bc7d382 100644
--- a/gst-libs/gst/video/gstvideoencoder.c
+++ b/gst-libs/gst/video/gstvideoencoder.c
@@ -1118,6 +1118,8 @@ gst_video_encoder_sink_event_default (GstVideoEncoder * encoder,
         gst_event_unref (event);
         event = gst_video_encoder_create_merged_tags_event (encoder);
         GST_VIDEO_ENCODER_STREAM_UNLOCK (encoder);
+        if (!event)
+          ret = TRUE;
       }
       break;
     }