diff --git a/dashboard-ui/scripts/mediaplayer-video.js b/dashboard-ui/scripts/mediaplayer-video.js
index 6e20b30e6b..47a460d493 100644
--- a/dashboard-ui/scripts/mediaplayer-video.js
+++ b/dashboard-ui/scripts/mediaplayer-video.js
@@ -620,8 +620,6 @@
 
             AppSettings.maxStreamingBitrate(bitrate);
 
-            $('.videoQualityPopup').popup('close');
-
             self.changeStream(self.getCurrentTicks(), {
                 Bitrate: bitrate
             });
diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js
index dcacb06290..723bf46625 100644
--- a/dashboard-ui/scripts/mediaplayer.js
+++ b/dashboard-ui/scripts/mediaplayer.js
@@ -605,6 +605,12 @@
                     self.currentMediaSource = result.MediaSources[0];
                     var streamInfo = self.createStreamInfo(self.currentItem.MediaType, self.currentItem, self.currentMediaSource, ticks);
 
+                    if (!streamInfo.url) {
+                        MediaController.showPlaybackInfoErrorMessage('NoCompatibleStream');
+                        self.stop();
+                        return false;
+                    }
+
                     self.currentSubtitleStreamIndex = subtitleStreamIndex;
 
                     currentSrc = streamInfo.url;
@@ -893,7 +899,7 @@
                         mediaUrl += seekParam;
 
                         playMethod = 'DirectStream';
-                    } else {
+                    } else if (mediaSource.SupportsTranscoding) {
 
                         mediaUrl = ApiClient.getUrl(mediaSource.TranscodingUrl);
 
@@ -938,7 +944,8 @@
                         mediaUrl += "&static=true" + seekParam;
 
                         playMethod = 'DirectStream';
-                    } else {
+
+                    } else if (mediaSource.SupportsTranscoding) {
 
                         mediaUrl = ApiClient.getUrl(mediaSource.TranscodingUrl);