diff --git a/static/js/editor.js b/static/js/editor.js
index 28d3b5bae..bbe87b251 100644
--- a/static/js/editor.js
+++ b/static/js/editor.js
@@ -98,10 +98,10 @@ pandora.ui.editor = function(data) {
             showLayers: Ox.clone(ui.showLayers),
             showUsers: pandora.site.annotations.showUsers,
             subtitles: data.subtitles,
-            subtitlesDefaultTrack: Ox.getLanguageNameByCode(pandora.site.language),
+            subtitlesDefaultTrack: data.subtitlesDefaultTrack || Ox.getLanguageNameByCode(pandora.site.language),
             subtitlesLayer: data.subtitlesLayer,
             subtitlesOffset: ui.videoSubtitlesOffset,
-            subtitlesTrack: Ox.getLanguageNameByCode(pandora.site.language),
+            subtitlesTrack: data.subtitlesTrack || Ox.getLanguageNameByCode(pandora.site.language),
             timeline: ui.videoTimeline,
             timelines: pandora.site.timelines,
             video: data.video,