diff --git a/src/apps/mediaplayer/media_node_framework/video/VideoProducer.cpp b/src/apps/mediaplayer/media_node_framework/video/VideoProducer.cpp
index 64238600cd..774dfc3ed2 100644
--- a/src/apps/mediaplayer/media_node_framework/video/VideoProducer.cpp
+++ b/src/apps/mediaplayer/media_node_framework/video/VideoProducer.cpp
@@ -170,8 +170,13 @@ VideoProducer::HandleEvent(const media_timed_event* event,
 			_HandleStart(event->event_time);
 			break;
 		case BTimedEventQueue::B_STOP:
+		{
+			EventQueue()->FlushEvents(event->event_time,
+				BTimedEventQueue::B_ALWAYS,
+				true, BTimedEventQueue::B_HANDLE_BUFFER);
 			_HandleStop();
 			break;
+		}
 		case BTimedEventQueue::B_WARP:
 			_HandleTimeWarp(event->bigdata);
 			break;