diff --git a/static/js/editor.js b/static/js/editor.js
index 080026740..3c7faebbf 100644
--- a/static/js/editor.js
+++ b/static/js/editor.js
@@ -3,7 +3,6 @@
 'use strict';
 
 pandora.ui.editor = function(data) {
-
     var ui = pandora.user.ui,
 
         that = Ox.VideoAnnotationPanel({
diff --git a/static/js/tv.js b/static/js/tv.js
index cefdac69e..f35cf01a9 100644
--- a/static/js/tv.js
+++ b/static/js/tv.js
@@ -38,6 +38,20 @@ pandora.ui.tv = function() {
         });
     }
 
+    function getSubtitles(options) {
+        return options.subtitlesLayer ? options.annotations.filter(function(layer) {
+            return layer.id == options.subtitlesLayer;
+        })[0].items.map(function(subtitle) {
+            return {
+                id: subtitle.id,
+                'in': subtitle['in'],
+                out: subtitle.out,
+                text: subtitle.value.replace(/\n/g, ' ').replace(/<br\/?>/g, '\n'),
+                tracks: subtitle.languages || [Ox.getLanguageNameByCode(pandora.site.language)]
+            };
+        }) : []
+    }
+
     function play() {
         var $loading = $('<img>')
                 .attr({src: Ox.UI.getImageURL('symbolLoadingAnimated')})
@@ -75,7 +89,7 @@ pandora.ui.tv = function() {
                     position: result.data.position,
                     resolution: pandora.user.ui.videoResolution,
                     scaleToFill: pandora.user.ui.videoScale == 'fill',
-                    subtitles: videoOptions.subtitles,
+                    subtitles: getSubtitles(videoOptions),
                     subtitlesDefaultTrack: Ox.getLanguageNameByCode(pandora.site.language),
                     subtitlesLayer: videoOptions.subtitlesLayer,
                     subtitlesTrack: Ox.getLanguageNameByCode(pandora.site.language),
diff --git a/static/js/utils.js b/static/js/utils.js
index a2c107833..581ed23bc 100644
--- a/static/js/utils.js
+++ b/static/js/utils.js
@@ -1741,7 +1741,7 @@ pandora.getSubtitlesLayer = function() {
     }).map(function(layer) {
         return layer.id;
     })[0];
-}
+};
 
 pandora.getMediaURL = function(url) {
     return pandora.site.site.mediaprefix + url;