diff --git a/platypush/plugins/media/mpv.py b/platypush/plugins/media/mpv.py
index 0e9f4f8dc..234064bbd 100644
--- a/platypush/plugins/media/mpv.py
+++ b/platypush/plugins/media/mpv.py
@@ -84,9 +84,9 @@ class MediaMpvPlugin(MediaPlugin):
                 bus.post(MediaPauseEvent(resource=self._get_current_resource()))
             elif evt == Event.UNPAUSE:
                 bus.post(MediaPlayEvent(resource=self._get_current_resource()))
-            elif evt == Event.END_FILE or evt == Event.SHUTDOWN:
-                if evt == Event.SHUTDOWN:
-                    self._player = None
+            # elif evt == Event.END_FILE or evt == Event.SHUTDOWN:
+            elif evt == Event.SHUTDOWN:
+                self._player = None
                 self._mpv_stopped_event.set()
                 bus.post(MediaStopEvent())
         return callback