diff --git a/gst/hls/gsthlsdemux.c b/gst/hls/gsthlsdemux.c
index 4513ef0b1e..745dfd1bc9 100644
--- a/gst/hls/gsthlsdemux.c
+++ b/gst/hls/gsthlsdemux.c
@@ -532,6 +532,11 @@ gst_hls_demux_loop (GstHLSDemux * demux)
     GST_TASK_WAIT (demux->task);
   }
 
+  /* Check again if it's the end of the playlist in case we we reached */
+  if (demux->end_of_playlist) {
+    goto end_of_playlist;
+  }
+
   buf = g_queue_pop_head (demux->queue);
   ret = gst_pad_push (demux->srcpad, buf);
   if (ret != GST_FLOW_OK)