diff --git a/player/videojs.coffee b/player/videojs.coffee
index c62445c5..383d77e3 100644
--- a/player/videojs.coffee
+++ b/player/videojs.coffee
@@ -5,6 +5,8 @@ sortSources = (sources) ->
 
     qualities = ['1080', '720', '480', '360', '240']
     pref = String(USEROPTS.default_quality)
+    if USEROPTS.default_quality == 'best'
+        pref = '1080'
     idx = qualities.indexOf(pref)
     if idx < 0
         idx = 2
diff --git a/www/js/player.js b/www/js/player.js
index af6ac665..2c0ea138 100644
--- a/www/js/player.js
+++ b/www/js/player.js
@@ -452,6 +452,9 @@
     }
     qualities = ['1080', '720', '480', '360', '240'];
     pref = String(USEROPTS.default_quality);
+    if (USEROPTS.default_quality === 'best') {
+      pref = '1080';
+    }
     idx = qualities.indexOf(pref);
     if (idx < 0) {
       idx = 2;