diff --git a/frontend/src/Settings/MediaManagement/MediaManagement.js b/frontend/src/Settings/MediaManagement/MediaManagement.js
index dbee2bd7e..5ebda35e4 100644
--- a/frontend/src/Settings/MediaManagement/MediaManagement.js
+++ b/frontend/src/Settings/MediaManagement/MediaManagement.js
@@ -87,7 +87,7 @@ class MediaManagement extends Component {
 
                         <FormInputGroup
                           type={inputTypes.CHECK}
-                          isDisabled={settings.deleteEmptyFolders.value}
+                          isDisabled={settings.deleteEmptyFolders.value && !settings.createEmptyMovieFolders.value}
                           name="createEmptyMovieFolders"
                           helpText="Create missing movie folders during disk scan"
                           onChange={onInputChange}
@@ -104,7 +104,7 @@ class MediaManagement extends Component {
 
                         <FormInputGroup
                           type={inputTypes.CHECK}
-                          isDisabled={settings.createEmptyMovieFolders.value}
+                          isDisabled={settings.createEmptyMovieFolders.value && !settings.deleteEmptyFolders.value}
                           name="deleteEmptyFolders"
                           helpText="Delete empty movie folders during disk scan and when movie files are deleted"
                           onChange={onInputChange}