diff --git a/FileFlows.Plugin.dll b/FileFlows.Plugin.dll
index 299eac72..020a8da6 100644
Binary files a/FileFlows.Plugin.dll and b/FileFlows.Plugin.dll differ
diff --git a/FileFlows.Plugin.pdb b/FileFlows.Plugin.pdb
index a7cd7546..f5e1a6fd 100644
Binary files a/FileFlows.Plugin.pdb and b/FileFlows.Plugin.pdb differ
diff --git a/Web/Helpers/DownloadHelper.cs b/Web/Helpers/DownloadHelper.cs
index d35e1d6e..a938bb5c 100644
--- a/Web/Helpers/DownloadHelper.cs
+++ b/Web/Helpers/DownloadHelper.cs
@@ -1,5 +1,6 @@
 using System.Net;
 using System.Text.RegularExpressions;
+using FileFlows.Plugin.Helpers;
 
 namespace FileFlows.Web.Helpers;
 
@@ -78,7 +79,13 @@ public static class DownloadHelper
                         }
                     }
 
-                    tempFile += fileExtension;
+                    if (string.IsNullOrWhiteSpace(fileExtension) == false)
+                    {
+                        if(string.IsNullOrWhiteSpace(FileHelper.GetExtension(tempFile)) == false)
+                            tempFile = FileHelper.ChangeExtension(tempFile, fileExtension);
+                        else
+                            tempFile += fileExtension;
+                    }
                 }
 
                 using (var contentStream = response.Content.ReadAsStreamAsync().Result)