diff --git a/src/apps/mediaplayer/Controller.cpp b/src/apps/mediaplayer/Controller.cpp
index c49fde4bb6..0149da5fbc 100644
--- a/src/apps/mediaplayer/Controller.cpp
+++ b/src/apps/mediaplayer/Controller.cpp
@@ -91,6 +91,9 @@ Controller::SetTo(const entry_ref &ref)
 {
 	acquire_sem(fAudioPlaySem);
 	acquire_sem(fVideoPlaySem);
+	
+	StopAudioPlayback();
+	StopVideoPlayback();
 
 	fAudioTrackList->MakeEmpty();
 	fVideoTrackList->MakeEmpty();