diff --git a/dashboard-ui/scripts/mediaplayer-video.js b/dashboard-ui/scripts/mediaplayer-video.js
index 8d6e2c59ff..690ebfbeab 100644
--- a/dashboard-ui/scripts/mediaplayer-video.js
+++ b/dashboard-ui/scripts/mediaplayer-video.js
@@ -613,6 +613,7 @@
         self.onQualityOptionSelected = function (bitrate) {
 
             AppSettings.maxStreamingBitrate(bitrate);
+            AppSettings.enableAutomaticBitrateDetection(false);
 
             self.changeStream(self.getCurrentTicks(), {
                 Bitrate: bitrate
diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js
index 581ed61bb5..e4f09d9ef7 100644
--- a/dashboard-ui/scripts/mediaplayer.js
+++ b/dashboard-ui/scripts/mediaplayer.js
@@ -187,7 +187,15 @@
 
             return new Promise(function (resolve, reject) {
 
-                require(['browserdeviceprofile'], function (profile) {
+                require(['browserdeviceprofile', 'qualityoptions'], function (profile, qualityoptions) {
+
+                    var bitrateSetting = AppSettings.maxStreamingBitrate();
+
+                    if (!maxHeight) {
+                        maxHeight = qualityoptions.getVideoQualityOptions(bitrateSetting).filter(function (q) {
+                            return q.selected;
+                        })[0].maxHeight;
+                    }
 
                     if (AppInfo.isNativeApp && browserInfo.android) {
                         updateDeviceProfileForAndroid(profile);
@@ -195,6 +203,9 @@
                     else if (AppInfo.isNativeApp && browserInfo.safari) {
                         updateDeviceProfileForIOS(profile);
                     }
+
+                    profile.MaxStreamingBitrate = bitrateSetting;
+
                     resolve(profile);
                 });
             });