diff --git a/src/file.js b/src/file.js
index 543c5011fa..c98da6c761 100644
--- a/src/file.js
+++ b/src/file.js
@@ -23,7 +23,7 @@ file.saveFileToLocal = function(filename, folder, tempPath, callback) {
 
 	is.on('end', function () {
 		callback(null, {
-			url: nconf.get('upload_url') + folder + '/' + filename
+			url: nconf.get('upload_url') + folder + '/' + encodeURIComponent(filename)
 		});
 	});