diff --git a/app/assets/javascripts/discourse/lib/uploads.js.es6 b/app/assets/javascripts/discourse/lib/uploads.js.es6
index 3a31d423c90..fbd75fa3647 100644
--- a/app/assets/javascripts/discourse/lib/uploads.js.es6
+++ b/app/assets/javascripts/discourse/lib/uploads.js.es6
@@ -14,7 +14,7 @@ function imageNameFromFileName(fileName) {
     name = I18n.t("upload_selector.default_image_alt_text");
   }
 
-  return encodeURIComponent(name);
+  return encodeURIComponent(name).replace(/%20/g, " ");
 }
 
 export function validateUploadedFiles(files, opts) {
diff --git a/test/javascripts/lib/uploads-test.js.es6 b/test/javascripts/lib/uploads-test.js.es6
index 76a074aa6dd..858dcb3a622 100644
--- a/test/javascripts/lib/uploads-test.js.es6
+++ b/test/javascripts/lib/uploads-test.js.es6
@@ -200,6 +200,10 @@ QUnit.test("getUploadMarkdown", assert => {
     testUploadMarkdown("[foo|bar].png"),
     "![%5Bfoo%7Cbar%5D|100x200](/uploads/123/abcdef.ext)"
   );
+  assert.equal(
+    testUploadMarkdown("file name with space.png"),
+    "![file name with space|100x200](/uploads/123/abcdef.ext)"
+  );
 
   const short_url = "uploads://asdaasd.ext";