diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js
index 66c22730b7..5d2c487417 100644
--- a/dashboard-ui/scripts/mediaplayer.js
+++ b/dashboard-ui/scripts/mediaplayer.js
@@ -169,6 +169,8 @@
     },
 
     playVideo: function (items, startPosition) {
+		//stop/kill videoJS
+	    if (MediaPlayer.mediaElement) MediaPlayer.stop();
 
         var item = items[0];
 
@@ -248,7 +250,7 @@
                 localStorage.setItem("volume", (this).volume());
             });
 
-            (this).addEvent("play", MediaPlayer.updateProgress);
+	        (this).addEvent("play", MediaPlayer.updateProgress);
 
             ApiClient.reportPlaybackStart(Dashboard.getCurrentUserId(), item.Id);
         });