diff --git a/platypush/plugins/media/ctrl.py b/platypush/plugins/media/ctrl.py
index fbf8350f33..c14cfab51d 100644
--- a/platypush/plugins/media/ctrl.py
+++ b/platypush/plugins/media/ctrl.py
@@ -23,7 +23,6 @@ class MediaCtrlPlugin(Plugin):
         self.torrentcast_port = torrentcast_port
         self.url = None
         self.plugin = None
-        self.videos_queue = []
 
     @classmethod
     def _get_type_and_resource_by_url(cls, url):
@@ -101,14 +100,6 @@ class MediaCtrlPlugin(Plugin):
     def previous(self):
         if self.plugin: return self.plugin.previous()
 
-        if self.plugin:
-            self.plugin.stop()
-
-        if self.videos_queue:
-            return self.play(self.videos_queue.pop(0))
-
-        return Response(output={'status': 'no media'}, errors = [])
-
 
 # vim:sw=4:ts=4:et:
 
diff --git a/platypush/plugins/video/omxplayer.py b/platypush/plugins/video/omxplayer.py
index f9b77bf5b7..f1cd48ca44 100644
--- a/platypush/plugins/video/omxplayer.py
+++ b/platypush/plugins/video/omxplayer.py
@@ -18,6 +18,7 @@ class VideoOmxplayerPlugin(Plugin):
     def __init__(self, args=[], *argv, **kwargs):
         self.args = args
         self.player = None
+        self.videos_queue = []
 
     def play(self, resource):
         if resource.startswith('youtube:') \