From e628c488cff3fdd8d75b34aabc0b82136327d017 Mon Sep 17 00:00:00 2001
From: shamoon <4887959+shamoon@users.noreply.github.com>
Date: Wed, 9 Apr 2025 15:54:11 -0700
Subject: [PATCH] Re-add fix from #9599

---
 src/paperless/views.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/paperless/views.py b/src/paperless/views.py
index 4527e7465..57c1ec807 100644
--- a/src/paperless/views.py
+++ b/src/paperless/views.py
@@ -2774,9 +2774,13 @@ def serve_file(*, doc: Document, use_archive: bool, disposition: str):
     # RFC 5987 addresses this issue
     # see https://datatracker.ietf.org/doc/html/rfc5987#section-4.2
     # Chromium cannot handle commas in the filename
-    filename_normalized = normalize("NFKD", filename.replace(",", "_")).encode(
-        "ascii",
-        "ignore",
+    filename_normalized = (
+        normalize("NFKD", filename.replace(",", "_"))
+        .encode(
+            "ascii",
+            "ignore",
+        )
+        .decode("ascii")
     )
     filename_encoded = quote(filename)
     content_disposition = (