diff --git a/source/Ox.UI/js/Video/VideoAnnotationPanel.js b/source/Ox.UI/js/Video/VideoAnnotationPanel.js
index e33385b5..a2e8ba6b 100644
--- a/source/Ox.UI/js/Video/VideoAnnotationPanel.js
+++ b/source/Ox.UI/js/Video/VideoAnnotationPanel.js
@@ -1561,6 +1561,7 @@ Ox.VideoAnnotationPanel = function(options, self) {
     }
 
     function updateSubtitles() {
+        // FIXME: missing: re-render subtitles submenu
         self.options.subtitles = parseSubtitles();
         self.$player.forEach(function($player) {
             $player.options({subtitles: Ox.clone(self.options.subtitles, true)});
diff --git a/source/Ox.UI/js/Video/VideoPlayer.js b/source/Ox.UI/js/Video/VideoPlayer.js
index a0302cfa..40caa010 100644
--- a/source/Ox.UI/js/Video/VideoPlayer.js
+++ b/source/Ox.UI/js/Video/VideoPlayer.js
@@ -1617,7 +1617,7 @@ Ox.VideoPlayer = function(options, self) {
                 if (
                     v['in'] <= self.options.position
                     && v.out >= self.options.position
-                    && Ox.contains(v.tracks, self.options.subtitlesTrack)
+                    && (!v.tracks || Ox.contains(v.tracks, self.options.subtitlesTrack))
                 ) {
                     subtitle = v.text;
                     return false; // break
@@ -1630,7 +1630,7 @@ Ox.VideoPlayer = function(options, self) {
     function getSubtitles() {
         return self.options.enableSubtitles
             ? self.options.subtitles.filter(function(v) {
-                return Ox.contains(v.tracks, self.options.subtitlesTrack);
+                return !v.tracks || Ox.contains(v.tracks, self.options.subtitlesTrack);
             })
             : [];
     }