diff --git a/src/components/libraryoptionseditor/libraryoptionseditor.js b/src/components/libraryoptionseditor/libraryoptionseditor.js
index 964b2bb745..5fdd413c14 100644
--- a/src/components/libraryoptionseditor/libraryoptionseditor.js
+++ b/src/components/libraryoptionseditor/libraryoptionseditor.js
@@ -412,9 +412,9 @@ import template from './libraryoptionseditor.template.html';
         }
 
         if (contentType === 'tvshows' || contentType === 'movies' || contentType === 'musicvideos' || contentType === 'mixed') {
-            parent.querySelector('.chkDisableEmbeddedSubtitlesContainer').classList.remove('hide');
+            parent.querySelector('.fldAllowEmbeddedSubtitlesContainer').classList.remove('hide');
         } else {
-            parent.querySelector('.chkDisableEmbeddedSubtitlesContainer').classList.add('hide');
+            parent.querySelector('.fldAllowEmbeddedSubtitlesContainer').classList.add('hide');
         }
 
         parent.querySelector('.chkAutomaticallyAddToCollectionContainer').classList.toggle('hide', contentType !== 'movies');
@@ -515,7 +515,7 @@ import template from './libraryoptionseditor.template.html';
             AutomaticRefreshIntervalDays: parseInt(parent.querySelector('#selectAutoRefreshInterval').value),
             EnableEmbeddedTitles: parent.querySelector('#chkEnableEmbeddedTitles').checked,
             EnableEmbeddedEpisodeInfos: parent.querySelector('#chkEnableEmbeddedEpisodeInfos').checked,
-            DisableEmbeddedSubtitles: parent.querySelector('#chkDisableEmbeddedSubtitles').checked,
+            AllowEmbeddedSubtitles: parent.querySelector('#selectAllowEmbeddedSubtitles').value,
             SkipSubtitlesIfEmbeddedSubtitlesPresent: parent.querySelector('#chkSkipIfGraphicalSubsPresent').checked,
             SkipSubtitlesIfAudioTrackMatches: parent.querySelector('#chkSkipIfAudioTrackPresent').checked,
             SaveSubtitlesWithMedia: parent.querySelector('#chkSaveSubtitlesLocally').checked,
@@ -567,8 +567,8 @@ import template from './libraryoptionseditor.template.html';
         parent.querySelector('#chkSaveLocal').checked = options.SaveLocalMetadata;
         parent.querySelector('.chkAutomaticallyGroupSeries').checked = options.EnableAutomaticSeriesGrouping;
         parent.querySelector('#chkEnableEmbeddedTitles').checked = options.EnableEmbeddedTitles;
-        parent.querySelector('#chkEnableEmbeddedEpisodeInfos').checked = options.EnableEmbeddedEpisodeInfos;
-        parent.querySelector('#chkDisableEmbeddedSubtitles').checked = options.DisableEmbeddedSubtitles;
+        parent.querySelector('#chkEnableEmbeddedEpisodeInfos').value = options.EnableEmbeddedEpisodeInfos;
+        parent.querySelector("#selectAllowEmbeddedSubtitles").value = options.AllowEmbeddedSubtitles;
         parent.querySelector('#chkSkipIfGraphicalSubsPresent').checked = options.SkipSubtitlesIfEmbeddedSubtitlesPresent;
         parent.querySelector('#chkSaveSubtitlesLocally').checked = options.SaveSubtitlesWithMedia;
         parent.querySelector('#chkSkipIfAudioTrackPresent').checked = options.SkipSubtitlesIfAudioTrackMatches;
diff --git a/src/components/libraryoptionseditor/libraryoptionseditor.template.html b/src/components/libraryoptionseditor/libraryoptionseditor.template.html
index 57cca6302c..8f792eaab2 100644
--- a/src/components/libraryoptionseditor/libraryoptionseditor.template.html
+++ b/src/components/libraryoptionseditor/libraryoptionseditor.template.html
@@ -30,12 +30,14 @@
     </label>
     <div class="fieldDescription checkboxFieldDescription">${PreferEmbeddedEpisodeInfosOverFileNamesHelp}</div>
 </div>
-<div class="checkboxContainer checkboxContainer-withDescription chkDisableEmbeddedSubtitlesContainer hide advanced">
-    <label>
-        <input is="emby-checkbox" type="checkbox" id="chkDisableEmbeddedSubtitles" />
-        <span>${DisableEmbeddedSubtitles}</span>
-    </label>
-    <div class="fieldDescription checkboxFieldDescription">${DisableEmbeddedSubtitlesHelp}</div>
+<div class="selectContainer fldAllowEmbeddedSubtitlesContainer hide advanced" style="margin: 2em 0;">
+    <select is="emby-select" id="selectAllowEmbeddedSubtitles" label="${AllowEmbeddedSubtitles}">
+        <option value="AllowAll">${AllowEmbeddedSubtitlesAllowAllOption}</option>
+        <option value="AllowText">${AllowEmbeddedSubtitlesAllowTextOption}</option>
+        <option value="AllowImage">${AllowEmbeddedSubtitlesAllowImageOption}</option>
+        <option value="AllowNone">${AllowEmbeddedSubtitlesAllowNoneOption}</option>
+    </select>
+    <div class="fieldDescription">${AllowEmbeddedSubtitlesHelp}</div>
 </div>
 
 <div class="checkboxContainer checkboxContainer-withDescription advanced">
diff --git a/src/strings/en-gb.json b/src/strings/en-gb.json
index 22c2326267..a1a29061be 100644
--- a/src/strings/en-gb.json
+++ b/src/strings/en-gb.json
@@ -1266,8 +1266,12 @@
     "Season": "Series",
     "PreferEmbeddedEpisodeInfosOverFileNames": "Prefer embedded episode information over filenames",
     "PreferEmbeddedEpisodeInfosOverFileNamesHelp": "Use the episode information from the embedded metadata if available.",
-    "DisableEmbeddedSubtitles": "Disable embedded subtitles",
-    "DisableEmbeddedSubtitlesHelp": "Disable subtitles that are packaged within media containers.",
+    "AllowEmbeddedSubtitles": "Disable different types of embedded subtitles",
+    "AllowEmbeddedSubtitlesHelp": "Disable subtitles that are packaged within media containers. Requires a full library refresh.",
+    "AllowEmbeddedSubtitlesAllowAllOption": "Allow All",
+    "AllowEmbeddedSubtitlesAllowNoneOption": "Allow None",
+    "AllowEmbeddedSubtitlesAllowImageOption": "Allow Image",
+    "AllowEmbeddedSubtitlesAllowTextOption": "Allow Text",
     "Person": "Person",
     "Movie": "Film",
     "LabelLibraryPageSizeHelp": "Set the amount of items to show on a library page. Set to 0 in order to disable paging.",
diff --git a/src/strings/en-us.json b/src/strings/en-us.json
index 0685d09df5..725af66861 100644
--- a/src/strings/en-us.json
+++ b/src/strings/en-us.json
@@ -1288,8 +1288,12 @@
     "PreferEmbeddedEpisodeInfosOverFileNamesHelp": "Use the episode information from the embedded metadata if available.",
     "PreferEmbeddedTitlesOverFileNames": "Prefer embedded titles over filenames",
     "PreferEmbeddedTitlesOverFileNamesHelp": "Determine the display title to use when no internet metadata or local metadata is available.",
-    "DisableEmbeddedSubtitles": "Disable embedded subtitles",
-    "DisableEmbeddedSubtitlesHelp": "Disable subtitles that are packaged within media containers.",
+    "AllowEmbeddedSubtitles": "Disable different types of embedded subtitles",
+    "AllowEmbeddedSubtitlesHelp": "Disable subtitles that are packaged within media containers. Requires a full library refresh.",
+    "AllowEmbeddedSubtitlesAllowAllOption": "Allow All",
+    "AllowEmbeddedSubtitlesAllowNoneOption": "Allow None",
+    "AllowEmbeddedSubtitlesAllowImageOption": "Allow Image",
+    "AllowEmbeddedSubtitlesAllowTextOption": "Allow Text",
     "Premiere": "Premiere",
     "Premieres": "Premieres",
     "Preview": "Preview",