diff --git a/dashboard-ui/bower_components/emby-webcomponents/prompt/prompt.js b/dashboard-ui/bower_components/emby-webcomponents/prompt/prompt.js
index 58bd2c7486..fe532644a8 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/prompt/prompt.js
+++ b/dashboard-ui/bower_components/emby-webcomponents/prompt/prompt.js
@@ -33,11 +33,7 @@ define(['dialogHelper', 'layoutManager', 'scrollHelper', 'globalize', 'require',
             dialogHelper.close(dlg);
         });
 
-        if (options.title) {
-            dlg.querySelector('.dialogContentTitle').innerHTML = options.title;
-        } else {
-            dlg.querySelector('.dialogContentTitle').classList.add('hide');
-        }
+        dlg.querySelector('.dialogContentTitle').innerHTML = options.title || '';
 
         if (options.description) {
             dlg.querySelector('.fieldDescription').innerHTML = options.description;
diff --git a/dashboard-ui/livetvsettings.html b/dashboard-ui/livetvsettings.html
index 25bacc216a..ae11c8f938 100644
--- a/dashboard-ui/livetvsettings.html
+++ b/dashboard-ui/livetvsettings.html
@@ -71,6 +71,12 @@
                     <div class="fieldDescription paperCheckboxFieldDescription">${OptionConvertRecordingsToStreamingFormatHelp}</div>
                     <div class="fieldDescription paperCheckboxFieldDescription btnSupporterForConverting"><a href="https://emby.media/premiere" target="_blank" class="accent">${FeatureRequiresEmbyPremiere}</a></div>
                 </div>
+                <div class="selectContainer">
+                    <select is="emby-select" id="selectConversionFormat" label="${LabelConvertRecordingsTo}">
+                        <option value="mp4">MP4</option>
+                        <option value="mkv">MKV</option>
+                    </select>
+                </div>
                 <div class="checkboxContainer checkboxContainer-withDescription">
                     <label>
                         <input type="checkbox" is="emby-checkbox" id="chkPreserveAudio" />
diff --git a/dashboard-ui/scripts/livetvsettings.js b/dashboard-ui/scripts/livetvsettings.js
index 126c7e5c21..cde691e1e1 100644
--- a/dashboard-ui/scripts/livetvsettings.js
+++ b/dashboard-ui/scripts/livetvsettings.js
@@ -18,6 +18,7 @@
         page.querySelector('#txtRecordingPath').value = config.RecordingPath || '';
         page.querySelector('#txtMovieRecordingPath').value = config.MovieRecordingPath || '';
         page.querySelector('#txtSeriesRecordingPath').value = config.SeriesRecordingPath || '';
+        page.querySelector('#selectConversionFormat').value = config.RecordingEncodingFormat || '';
 
         page.querySelector('#chkEnableRecordingSubfolders').checked = config.EnableRecordingSubfolders || false;
 
@@ -50,6 +51,7 @@
             config.MovieRecordingPath = movieRecordingPath;
             config.SeriesRecordingPath = seriesRecordingPath;
 
+            config.RecordingEncodingFormat = form.querySelector('#selectConversionFormat').value;
             config.PrePaddingSeconds = $('#txtPrePaddingMinutes', form).val() * 60;
             config.PostPaddingSeconds = $('#txtPostPaddingMinutes', form).val() * 60;
             config.EnableRecordingSubfolders = form.querySelector('#chkEnableRecordingSubfolders').checked;
diff --git a/dashboard-ui/strings/en-US.json b/dashboard-ui/strings/en-US.json
index 0b0f2664e9..26346ca7bf 100644
--- a/dashboard-ui/strings/en-US.json
+++ b/dashboard-ui/strings/en-US.json
@@ -1337,7 +1337,7 @@
   "LabelCodecIntrosPath": "Codec intros path:",
   "LabelCodecIntrosPathHelp": "A folder containing video files. If an intro video file name matches the video codec, audio codec, audio profile, or a tag, then it will be played prior to the main feature.",
   "OptionConvertRecordingsToStreamingFormat": "Automatically convert recordings to a streaming friendly format",
-  "OptionConvertRecordingsToStreamingFormatHelp": "Recordings will be converted on the fly to MP4 for easy playback on your devices.",
+  "OptionConvertRecordingsToStreamingFormatHelp": "Recordings will be converted on the fly to MP4 or MKV for easy playback on your devices.",
   "FeatureRequiresEmbyPremiere": "This feature requires an active Emby Premiere subscription.",
   "FileExtension": "File extension",
   "OptionReplaceExistingImages": "Replace existing images",
@@ -2135,5 +2135,6 @@
   "H264CrfHelp": "The Constant Rate Factor (CRF) is the default quality setting for the x264 encoder. You can set the values between 0 and 51, where lower values would result in better quality (at the expense of higher file sizes). Sane values are between 18 and 28. The default for x264 is 23, so you can use this as a starting point.",
   "Sports": "Sports",
   "HeaderForKids": "For Kids",
-  "HeaderRecordingGroups": "Recording Groups"
+  "HeaderRecordingGroups": "Recording Groups",
+  "LabelConvertRecordingsTo": "Convert recordings to:"
 }