diff --git a/server/models/client.js b/server/models/client.js
index d98a6b69..76decd4b 100644
--- a/server/models/client.js
+++ b/server/models/client.js
@@ -36,7 +36,7 @@ var client = {
     // filesize of 524 kilobytes or less. This allows the user to send many
     // torrent files reliably.
     files.forEach((file, index) => {
-      file.originalname = file.originalname.replace(/\s+/g, '.');
+      file.originalname = encodeURIComponent(file.originalname);
 
       let fileRequest = new ClientRequest();
       fileRequest.addFiles({files: file, path, start});