diff --git a/TwitchDownloaderWPF/WindowQueueOptions.xaml.cs b/TwitchDownloaderWPF/WindowQueueOptions.xaml.cs
index 6f26a4c8..6756a18b 100644
--- a/TwitchDownloaderWPF/WindowQueueOptions.xaml.cs
+++ b/TwitchDownloaderWPF/WindowQueueOptions.xaml.cs
@@ -165,11 +165,11 @@ private async void btnQueue_Click(object sender, RoutedEventArgs e)
                         if ((bool)checkRender.IsChecked && chatOptions.DownloadFormat == ChatFormat.Json)
                         {
                             ChatRenderTask renderTask = new ChatRenderTask();
-                            ChatRenderOptions renderOptions = MainWindow.pageChatRender.GetOptions(Path.ChangeExtension(chatOptions.Filename.Replace(".gz", ""), ".mp4"));
+                            ChatRenderOptions renderOptions = MainWindow.pageChatRender.GetOptions(Path.ChangeExtension(chatOptions.Filename.Replace(".gz", ""), '.' + MainWindow.pageChatRender.comboFormat.Text.ToLower()));
                             if (renderOptions.OutputFile.Trim() == downloadOptions.Filename.Trim())
                             {
                                 //Just in case VOD and chat paths are the same. Like the previous defaults
-                                renderOptions.OutputFile = Path.ChangeExtension(chatOptions.Filename.Replace(".gz", ""), " - CHAT.mp4");
+                                renderOptions.OutputFile = Path.ChangeExtension(chatOptions.Filename.Replace(".gz", ""), " - CHAT." + MainWindow.pageChatRender.comboFormat.Text.ToLower());
                             }
                             renderOptions.InputFile = chatOptions.Filename;
                             renderTask.DownloadOptions = renderOptions;
@@ -241,11 +241,11 @@ private async void btnQueue_Click(object sender, RoutedEventArgs e)
                         if ((bool)checkRender.IsChecked && chatOptions.DownloadFormat == ChatFormat.Json)
                         {
                             ChatRenderTask renderTask = new ChatRenderTask();
-                            ChatRenderOptions renderOptions = MainWindow.pageChatRender.GetOptions(Path.ChangeExtension(chatOptions.Filename.Replace(".gz", ""), ".mp4"));
+                            ChatRenderOptions renderOptions = MainWindow.pageChatRender.GetOptions(Path.ChangeExtension(chatOptions.Filename.Replace(".gz", ""), '.' + MainWindow.pageChatRender.comboFormat.Text.ToLower()));
                             if (renderOptions.OutputFile.Trim() == downloadOptions.Filename.Trim())
                             {
                                 //Just in case VOD and chat paths are the same. Like the previous defaults
-                                renderOptions.OutputFile = Path.ChangeExtension(chatOptions.Filename.Replace(".gz", ""), " - CHAT.mp4");
+                                renderOptions.OutputFile = Path.ChangeExtension(chatOptions.Filename.Replace(".gz", ""), " - CHAT." + MainWindow.pageChatRender.comboFormat.Text.ToLower());
                             }
                             renderOptions.InputFile = chatOptions.Filename;
                             renderTask.DownloadOptions = renderOptions;
@@ -294,7 +294,7 @@ private async void btnQueue_Click(object sender, RoutedEventArgs e)
                     if ((bool)checkRender.IsChecked && chatOptions.DownloadFormat == ChatFormat.Json)
                     {
                         ChatRenderTask renderTask = new ChatRenderTask();
-                        ChatRenderOptions renderOptions = MainWindow.pageChatRender.GetOptions(Path.ChangeExtension(chatOptions.Filename.Replace(".gz", ""), ".mp4"));
+                        ChatRenderOptions renderOptions = MainWindow.pageChatRender.GetOptions(Path.ChangeExtension(chatOptions.Filename.Replace(".gz", ""), '.' + MainWindow.pageChatRender.comboFormat.Text.ToLower()));
                         renderOptions.InputFile = chatOptions.Filename;
                         renderTask.DownloadOptions = renderOptions;
                         renderTask.Info.Title = chatPage.textTitle.Text;
@@ -467,11 +467,11 @@ private async void btnQueue_Click(object sender, RoutedEventArgs e)
                             if ((bool)checkRender.IsChecked && downloadOptions.DownloadFormat == ChatFormat.Json)
                             {
                                 ChatRenderTask renderTask = new ChatRenderTask();
-                                ChatRenderOptions renderOptions = MainWindow.pageChatRender.GetOptions(Path.ChangeExtension(downloadOptions.Filename.Replace(".gz", ""), ".mp4"));
+                                ChatRenderOptions renderOptions = MainWindow.pageChatRender.GetOptions(Path.ChangeExtension(downloadOptions.Filename.Replace(".gz", ""), '.' + MainWindow.pageChatRender.comboFormat.Text.ToLower()));
                                 if (renderOptions.OutputFile.Trim() == downloadOptions.Filename.Trim())
                                 {
                                     //Just in case VOD and chat paths are the same. Like the previous defaults
-                                    renderOptions.OutputFile = Path.ChangeExtension(downloadOptions.Filename.Replace(".gz", ""), " - CHAT.mp4");
+                                    renderOptions.OutputFile = Path.ChangeExtension(downloadOptions.Filename.Replace(".gz", ""), " - CHAT." + MainWindow.pageChatRender.comboFormat.Text.ToLower());
                                 }
                                 renderOptions.InputFile = downloadOptions.Filename;
                                 renderTask.DownloadOptions = renderOptions;