diff --git a/nodes.py b/nodes.py
index c9b636c94..f347da195 100644
--- a/nodes.py
+++ b/nodes.py
@@ -780,7 +780,7 @@ class SaveImage:
                     metadata.add_text(x, json.dumps(extra_pnginfo[x]))
 
             file = f"{filename}_{counter:05}_.png"
-            img.save(os.path.join(full_output_folder, file), pnginfo=metadata, optimize=True)
+            img.save(os.path.join(full_output_folder, file), pnginfo=metadata, compress_level=4)
             results.append({
                 "filename": file,
                 "subfolder": subfolder,
diff --git a/server.py b/server.py
index b1ec1fcf5..6a640fcc7 100644
--- a/server.py
+++ b/server.py
@@ -142,12 +142,12 @@ class PromptServer():
                         return web.Response(status=403)
                     output_dir = full_output_dir
 
-                file = request.rel_url.query["filename"]
-                file = os.path.basename(file)
-                file = os.path.join(output_dir, file)
+                filename = request.rel_url.query["filename"]
+                filename = os.path.basename(filename)
+                file = os.path.join(output_dir, filename)
 
                 if os.path.isfile(file):
-                    return web.FileResponse(file)
+                    return web.FileResponse(file, headers={"Content-Disposition": f"filename=\"{filename}\""})
                 
             return web.Response(status=404)