diff --git a/mod/folder/download_folder.php b/mod/folder/download_folder.php
index b3ed5b7e9c9..63626e33de1 100644
--- a/mod/folder/download_folder.php
+++ b/mod/folder/download_folder.php
@@ -52,7 +52,8 @@ folder_downloaded($folder, $course, $cm, $context);
 // Close the session.
 \core\session\manager::write_close();
 
-$filename = shorten_filename(clean_filename($folder->name . "-" . date("Ymd")) . ".zip");
+$foldername = format_string($folder->name, true, ["context" => $context]);
+$filename = shorten_filename(clean_filename($foldername . "-" . date("Ymd")) . ".zip");
 $zipwriter = \core_files\archive_writer::get_stream_writer($filename, \core_files\archive_writer::ZIP_WRITER);
 
 foreach ($files as $file) {