diff --git a/dashboard-ui/librarysettings.html b/dashboard-ui/librarysettings.html
index 54ec2331ca..cf88f129a6 100644
--- a/dashboard-ui/librarysettings.html
+++ b/dashboard-ui/librarysettings.html
@@ -90,15 +90,6 @@
                     <br />
                 </emby-collapsible>
 
-                <emby-collapsible title="${HeaderImages}">
-                    <br />
-                    <div>
-                        <paper-checkbox id="chkDownloadImagesInAdvance">${OptionDownloadImagesInAdvance}</paper-checkbox>
-                        <div class="fieldDescription paperCheckboxFieldDescription">${OptionDownloadImagesInAdvanceHelp}</div>
-                    </div>
-                    <br />
-                </emby-collapsible>
-
                 <emby-collapsible title="${HeaderPeople}">
                     <br />
                     <ul data-role="listview" class="ulForm">
diff --git a/dashboard-ui/metadata.html b/dashboard-ui/metadata.html
index 494884c885..eabd7e657c 100644
--- a/dashboard-ui/metadata.html
+++ b/dashboard-ui/metadata.html
@@ -14,6 +14,10 @@
                     <li>
                         <paper-checkbox id="chkSaveLocal">${LabelSaveLocalMetadata}</paper-checkbox>
                         <div class="fieldDescription paperCheckboxFieldDescription">${LabelSaveLocalMetadataHelp}</div>
+                    </li>
+                    <li>
+                        <paper-checkbox id="chkDownloadImagesInAdvance">${OptionDownloadImagesInAdvance}</paper-checkbox>
+                        <div class="fieldDescription paperCheckboxFieldDescription">${OptionDownloadImagesInAdvanceHelp}</div>
                         <br />
                     </li>
                     <li>
diff --git a/dashboard-ui/scripts/librarysettings.js b/dashboard-ui/scripts/librarysettings.js
index 234d81e268..879e4e3146 100644
--- a/dashboard-ui/scripts/librarysettings.js
+++ b/dashboard-ui/scripts/librarysettings.js
@@ -27,8 +27,6 @@
         $('#chkPeopleOthers', page).checked(config.PeopleMetadataOptions.DownloadOtherPeopleMetadata);
         $('#chkPeopleGuestStars', page).checked(config.PeopleMetadataOptions.DownloadGuestStarMetadata);
 
-        $('#chkDownloadImagesInAdvance', page).checked(config.DownloadImagesInAdvance);
-
         Dashboard.hideLoadingMsg();
     }
 
@@ -141,8 +139,6 @@
             config.MetadataPath = $('#txtMetadataPath', form).val();
             config.FanartApiKey = $('#txtFanartApiKey', form).val();
 
-            config.DownloadImagesInAdvance = $('#chkDownloadImagesInAdvance', form).checked();
-
             config.PeopleMetadataOptions.DownloadActorMetadata = $('#chkPeopleActors', form).checked();
             config.PeopleMetadataOptions.DownloadComposerMetadata = $('#chkPeopleComposers', form).checked();
             config.PeopleMetadataOptions.DownloadDirectorMetadata = $('#chkPeopleDirectors', form).checked();
diff --git a/dashboard-ui/scripts/metadataconfigurationpage.js b/dashboard-ui/scripts/metadataconfigurationpage.js
index c70aaae9d1..5691b9a7ef 100644
--- a/dashboard-ui/scripts/metadataconfigurationpage.js
+++ b/dashboard-ui/scripts/metadataconfigurationpage.js
@@ -9,6 +9,7 @@
         page.querySelector('#chkSaveLocal').checked = config.SaveLocalMeta;
         $('#selectLanguage', page).val(config.PreferredMetadataLanguage);
         $('#selectCountry', page).val(config.MetadataCountryCode);
+        $('#chkDownloadImagesInAdvance', page).checked(config.DownloadImagesInAdvance);
 
         Dashboard.hideLoadingMsg();
     }
@@ -24,6 +25,7 @@
             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(Dashboard.processServerConfigurationUpdateResult);
         });