diff --git a/server/vbv_lernwelt/course/tests/test_document_uploads.py b/server/vbv_lernwelt/course/tests/test_document_uploads.py
index 2ae0adea..2c5a242f 100644
--- a/server/vbv_lernwelt/course/tests/test_document_uploads.py
+++ b/server/vbv_lernwelt/course/tests/test_document_uploads.py
@@ -68,7 +68,7 @@ class DocumentUploadApiTestCase(APITestCase):
 
         self.assertEqual(
             response.data["fields"]["Content-Disposition"],
-            f"attachment; filename={self.test_data['file_name']}",
+            f'attachment; filename="{self.test_data["file_name"]}"',
         )
 
         file_id = response.data["file_id"]
diff --git a/server/vbv_lernwelt/files/integrations.py b/server/vbv_lernwelt/files/integrations.py
index b99801d8..7d101c3f 100644
--- a/server/vbv_lernwelt/files/integrations.py
+++ b/server/vbv_lernwelt/files/integrations.py
@@ -92,7 +92,7 @@ def s3_generate_presigned_post(
         Fields={
             "acl": acl,
             "Content-Type": file_type,
-            "Content-Disposition": f"attachment; filename={file_name}",
+            "Content-Disposition": f'attachment; filename="{file_name}"',
         },
         Conditions=[
             {"acl": acl},