diff --git a/dashboard-ui/components/libraryoptionseditor/libraryoptionseditor.js b/dashboard-ui/components/libraryoptionseditor/libraryoptionseditor.js
index 0c34e9452d..058cef342f 100644
--- a/dashboard-ui/components/libraryoptionseditor/libraryoptionseditor.js
+++ b/dashboard-ui/components/libraryoptionseditor/libraryoptionseditor.js
@@ -33,12 +33,18 @@
             parent.querySelector('.chkArhiveAsMediaContainer').classList.add('hide');
         }
 
-        if (contentType == 'homevideos') {
+        if (contentType == 'homevideos' || contentType == 'photos') {
             parent.querySelector('.chkEnablePhotosContainer').classList.remove('hide');
         } else {
             parent.querySelector('.chkEnablePhotosContainer').classList.add('hide');
         }
 
+        if (contentType == 'homevideos') {
+            parent.querySelector('.chkDownloadImagesInAdvanceContainer').classList.add('hide');
+        } else {
+            parent.querySelector('.chkDownloadImagesInAdvanceContainer').classList.remove('hide');
+        }
+
         if (contentType == 'tvshows' || contentType == 'movies' || contentType == 'homevideos' || contentType == 'musicvideos' || contentType == 'mixed' || !contentType) {
             parent.querySelector('.fldExtractChaptersDuringLibraryScan').classList.remove('hide');
             parent.querySelector('.fldExtractChapterImages').classList.remove('hide');
@@ -55,7 +61,8 @@
             EnablePhotos: parent.querySelector('.chkEnablePhotos').checked,
             EnableRealtimeMonitor: parent.querySelector('.chkEnableRealtimeMonitor').checked,
             ExtractChapterImagesDuringLibraryScan: parent.querySelector('.chkExtractChaptersDuringLibraryScan').checked,
-            EnableChapterImageExtraction: parent.querySelector('.chkExtractChapterImages').checked
+            EnableChapterImageExtraction: parent.querySelector('.chkExtractChapterImages').checked,
+            DownloadImagesInAdvance: parent.querySelector('#chkDownloadImagesInAdvance').checked
         };
 
         return options;
@@ -68,6 +75,7 @@
         parent.querySelector('.chkEnableRealtimeMonitor').checked = options.EnableRealtimeMonitor;
         parent.querySelector('.chkExtractChaptersDuringLibraryScan').checked = options.ExtractChapterImagesDuringLibraryScan;
         parent.querySelector('.chkExtractChapterImages').checked = options.EnableChapterImageExtraction;
+        parent.querySelector('#chkDownloadImagesInAdvance').checked = options.DownloadImagesInAdvance;
     }
 
     return {
diff --git a/dashboard-ui/components/libraryoptionseditor/libraryoptionseditor.template.html b/dashboard-ui/components/libraryoptionseditor/libraryoptionseditor.template.html
index 4de83a3589..1f0dc400df 100644
--- a/dashboard-ui/components/libraryoptionseditor/libraryoptionseditor.template.html
+++ b/dashboard-ui/components/libraryoptionseditor/libraryoptionseditor.template.html
@@ -14,6 +14,14 @@
     <div class="fieldDescription checkboxFieldDescription">${LabelEnableRealtimeMonitorHelp}</div>
 </div>
 
+<div class="checkboxContainer checkboxContainer-withDescription hide chkDownloadImagesInAdvanceContainer">
+    <label>
+        <input is="emby-checkbox" type="checkbox" id="chkDownloadImagesInAdvance" />
+        <span>${OptionDownloadImagesInAdvance}</span>
+    </label>
+    <div class="fieldDescription checkboxFieldDescription">${OptionDownloadImagesInAdvanceHelp}</div>
+</div>
+
 <div class="checkboxContainer checkboxContainer-withDescription fldExtractChapterImages hide">
     <label>
         <input type="checkbox" is="emby-checkbox" class="chkExtractChapterImages" />
diff --git a/dashboard-ui/metadata.html b/dashboard-ui/metadata.html
index bb57c2d419..516055a649 100644
--- a/dashboard-ui/metadata.html
+++ b/dashboard-ui/metadata.html
@@ -20,13 +20,6 @@
                     </label>
                     <div class="fieldDescription checkboxFieldDescription">${LabelSaveLocalMetadataHelp}</div>
                 </div>
-                <div class="checkboxContainer checkboxContainer-withDescription">
-                    <label>
-                        <input is="emby-checkbox" type="checkbox" id="chkDownloadImagesInAdvance" />
-                        <span>${OptionDownloadImagesInAdvance}</span>
-                    </label>
-                    <div class="fieldDescription checkboxFieldDescription">${OptionDownloadImagesInAdvanceHelp}</div>
-                </div>
                 <div class="selectContainer">
                     <select is="emby-select" id="selectLanguage" label="${LabelMetadataDownloadLanguage}" required="required"></select>
                 </div>
diff --git a/dashboard-ui/scripts/metadataconfigurationpage.js b/dashboard-ui/scripts/metadataconfigurationpage.js
index d8ecdd8450..f405fa42f7 100644
--- a/dashboard-ui/scripts/metadataconfigurationpage.js
+++ b/dashboard-ui/scripts/metadataconfigurationpage.js
@@ -9,7 +9,6 @@
         page.querySelector('#chkSaveLocal').checked = config.SaveLocalMeta;
         $('#selectLanguage', page).val(config.PreferredMetadataLanguage);
         $('#selectCountry', page).val(config.MetadataCountryCode);
-        $('#chkDownloadImagesInAdvance', page).checked(config.DownloadImagesInAdvance);
 
         Dashboard.hideLoadingMsg();
     }
@@ -25,7 +24,6 @@
             config.SaveLocalMeta = form.querySelector('#chkSaveLocal').checked;
             config.PreferredMetadataLanguage = $('#selectLanguage', form).val();
             config.MetadataCountryCode = $('#selectCountry', form).val();
-            config.DownloadImagesInAdvance = $('#chkDownloadImagesInAdvance', form).checked();
 
             ApiClient.updateServerConfiguration(config).then(function() {
                 Dashboard.processServerConfigurationUpdateResult();
diff --git a/dashboard-ui/strings/en-US.json b/dashboard-ui/strings/en-US.json
index 9af2328772..da1a45c932 100644
--- a/dashboard-ui/strings/en-US.json
+++ b/dashboard-ui/strings/en-US.json
@@ -1342,9 +1342,9 @@
   "FileExtension": "File extension",
   "OptionReplaceExistingImages": "Replace existing images",
   "OptionPlayNextEpisodeAutomatically": "Play next episode automatically",
-  "OptionDownloadImagesInAdvance": "Download all images in advance",
+  "OptionDownloadImagesInAdvance": "Download images in advance",
   "SettingsSaved": "Settings saved.",
-  "OptionDownloadImagesInAdvanceHelp": "By default, most secondary images are only downloaded when requested by an Emby app. Enable this option to download all images in advance, as new media is imported.",
+  "OptionDownloadImagesInAdvanceHelp": "By default, most images are only downloaded when requested by an Emby app. Enable this option to download all images in advance, as new media is imported.",
   "Users": "Users",
   "Delete": "Delete",
   "Password": "Password",