diff --git a/src/components/maincontroller.js b/src/components/maincontroller.js
index 3f6fee9a..7fef7a7b 100644
--- a/src/components/maincontroller.js
+++ b/src/components/maincontroller.js
@@ -134,6 +134,8 @@ mgr.addEventListener('PAUSE', mgr.defaultOnPause);
 mgr.defaultOnStop = function (event) {
     playbackMgr.stop();
 };
+
+mgr.addEventListener(cast.framework.events.EventType.MEDIA_FINISHED, mgr.defaultOnStop);
 mgr.addEventListener('ABORT', mgr.defaultOnStop);
 
 mgr.addEventListener('ENDED', function () {