diff --git a/app/assets/javascripts/discourse/lib/uploads.js.es6 b/app/assets/javascripts/discourse/lib/uploads.js.es6
index fbd75fa364..89b8b973b6 100644
--- a/app/assets/javascripts/discourse/lib/uploads.js.es6
+++ b/app/assets/javascripts/discourse/lib/uploads.js.es6
@@ -14,7 +14,9 @@ function imageNameFromFileName(fileName) {
     name = I18n.t("upload_selector.default_image_alt_text");
   }
 
-  return encodeURIComponent(name).replace(/%20/g, " ");
+  return name.replace(/\[|\]|\|/g, "");
+
+  // 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 858dcb3a62..5d08ed2ea1 100644
--- a/test/javascripts/lib/uploads-test.js.es6
+++ b/test/javascripts/lib/uploads-test.js.es6
@@ -198,7 +198,7 @@ QUnit.test("getUploadMarkdown", assert => {
   );
   assert.equal(
     testUploadMarkdown("[foo|bar].png"),
-    "![%5Bfoo%7Cbar%5D|100x200](/uploads/123/abcdef.ext)"
+    "![foobar|100x200](/uploads/123/abcdef.ext)"
   );
   assert.equal(
     testUploadMarkdown("file name with space.png"),