diff --git a/platformcode/launcher.py b/platformcode/launcher.py
index 4888a6cc..ae853493 100644
--- a/platformcode/launcher.py
+++ b/platformcode/launcher.py
@@ -222,6 +222,12 @@ def run(item=None):
             # Special action for findvideos, where the plugin looks for known urls
             elif item.action == "findvideos":
                 from core import servertools
+                from core import db
+                if db['OnPlay'].get('addon', False):
+                    item.autoplay = True
+                    platformtools.fakeVideo()
+                db.close()
+
 
                 # First checks if channel has a "findvideos" function
                 if hasattr(channel, 'findvideos'):
diff --git a/service.py b/service.py
index 5b934451..ce7332c0 100644
--- a/service.py
+++ b/service.py
@@ -400,7 +400,16 @@ class AddonMonitor(xbmc.Monitor):
             self.settings_pre = config.get_all_settings_addon()
 
     def onNotification(self, sender, method, data):
-        if method == 'VideoLibrary.OnUpdate':
+        # logger.debug('METHOD', method, sender, data)
+        if method == 'Playlist.OnAdd':
+            from core import db
+            db['OnPlay']['addon'] = True
+            db.close()
+        elif method == 'Player.OnStop':
+            from core import db
+            db['OnPlay']['addon'] = False
+            db.close()
+        elif method == 'VideoLibrary.OnUpdate':
             xbmc_videolibrary.set_watched_on_kod(data)
             logger.debug('AGGIORNO')