diff --git a/lib/models/FileRef.php b/lib/models/FileRef.php
index c4e09f1b3653ca8480815a9366ded6508a87bba7..f440d50e30ea85e4a4cb45c48044d7c60a18da4b 100644
--- a/lib/models/FileRef.php
+++ b/lib/models/FileRef.php
@@ -161,7 +161,7 @@ class FileRef extends SimpleORMap implements PrivacyObject, FeedbackRange
                     default:
                         $link[] = 'normal/';
                 }
-                $link[] = $type . '/' . $file_id . '/' . $file_name;
+                $link[] = $type . '/' . $file_id . '/' . urlencode($file_name);
                 break;
             default:
                 $link[] = 'sendfile.php';