diff --git a/gst-libs/gst/video/gstvideodecoder.c b/gst-libs/gst/video/gstvideodecoder.c
index 775ad5fd69..db550ba8c0 100644
--- a/gst-libs/gst/video/gstvideodecoder.c
+++ b/gst-libs/gst/video/gstvideodecoder.c
@@ -1224,7 +1224,8 @@ gst_video_decoder_sink_event_default (GstVideoDecoder * decoder,
           GST_VIDEO_DECODER_STREAM_UNLOCK (decoder);
           GST_ELEMENT_ERROR (decoder, STREAM, FORMAT, (NULL),
               ("Decoder output not negotiated before GAP event."));
-          return FALSE;
+          forward_immediate = TRUE;
+          break;
         }
       }
       GST_VIDEO_DECODER_STREAM_UNLOCK (decoder);