diff --git a/dashboard-ui/scripts/librarylist.js b/dashboard-ui/scripts/librarylist.js
index 4159bfa7ed..d55214233d 100644
--- a/dashboard-ui/scripts/librarylist.js
+++ b/dashboard-ui/scripts/librarylist.js
@@ -260,7 +260,7 @@
                 });
             }
 
-            if (user.Policy.EnableContentDownloading) {
+            if (user.Policy.EnableContentDownloading && AppInfo.supportsDownloading) {
                 if (mediaType) {
                     items.push({
                         name: Globalize.translate('ButtonDownload'),
@@ -1101,6 +1101,14 @@
                 ironIcon: 'playlist-add'
             });
 
+            if (user.Policy.EnableContentDownloading && AppInfo.supportsDownloading) {
+                //items.push({
+                //    name: Globalize.translate('ButtonDownload'),
+                //    id: 'download',
+                //    ironIcon: 'file-download'
+                //});
+            }
+
             items.push({
                 name: Globalize.translate('HeaderGroupVersions'),
                 id: 'groupvideos',