diff --git a/dashboard-ui/scripts/videojsextensions.js b/dashboard-ui/scripts/videojsextensions.js
index 314c16dab3..06f9e9a30a 100644
--- a/dashboard-ui/scripts/videojsextensions.js
+++ b/dashboard-ui/scripts/videojsextensions.js
@@ -75,7 +75,7 @@ var videoJSextension = {
 		if (item.MediaStreams && item.MediaStreams.length) {
 			var subCount = 1;
 			var langCount = 1;
-			var defaultLanguageIndex = defaults.languageIndex || 1;
+			var defaultLanguageIndex = defaults.languageIndex || null;
 			var defaultSubtitleIndex = defaults.subtitleIndex || 0;
 
 			// Put together the videojs source arrays for each available language and subtitle
@@ -91,6 +91,8 @@ var videoJSextension = {
 
 					vjs_languages[i].push(vjs_language);
 
+					if (!defaultLanguageIndex) defaultLanguageIndex = stream.Index;
+
 					langCount++;
 				}else if (stream.Type == "Subtitle") {
 					vjs_subtitles[i] = [];