diff --git a/resources/lib/monitor.py b/resources/lib/monitor.py
index ce164f68..e4daba2b 100644
--- a/resources/lib/monitor.py
+++ b/resources/lib/monitor.py
@@ -24,7 +24,7 @@ def log(self, msg, level=1):
         """Log wrapper"""
         ulog(msg, name=self.__class__.__name__, level=level)
 
-    def run(self):
+    def run(self):  # pylint: disable=too-many-branches
         """Main service loop"""
         self.log('Service started', 0)
 
@@ -64,6 +64,15 @@ def run(self):
                 self.playback_manager.demo.hide()
                 continue
 
+            if (current_file.startswith((
+                    'bluray://', 'dvd://', 'udf://', 'iso9660://', 'cdda://'))
+                    or current_file.endswith((
+                        '.bdmv', '.iso', '.ifo'))):
+                self.log('Up Next tracking stopped, Blu-ray/DVD/CD playing', 2)
+                self.player.disable_tracking()
+                self.playback_manager.demo.hide()
+                continue
+
             if last_file and last_file == from_unicode(current_file):
                 # Already processed this playback before
                 continue