diff --git a/lib/pleroma/upload.ex b/lib/pleroma/upload.ex
index 5691c6845..2717377a3 100644
--- a/lib/pleroma/upload.ex
+++ b/lib/pleroma/upload.ex
@@ -13,7 +13,7 @@ defmodule Pleroma.Upload do
       "url" => [%{
         "type" => "Link",
         "mediaType" => file.content_type,
-        "href" => url_for(Path.join(uuid, URI.encode(file.filename)))
+        "href" => url_for(Path.join(uuid, :cow_uri.urlencode(file.filename)))
       }],
       "name" => file.filename,
       "uuid" => uuid
@@ -38,7 +38,7 @@ defmodule Pleroma.Upload do
       "url" => [%{
         "type" => "Link",
         "mediaType" => content_type,
-        "href" => url_for(Path.join(uuid, URI.encode(filename)))
+        "href" => url_for(Path.join(uuid, :cow_uri.urlencode(filename)))
       }],
       "name" => filename,
       "uuid" => uuid
diff --git a/test/upload_test.exs b/test/upload_test.exs
index d29a1f2ba..71041e83c 100644
--- a/test/upload_test.exs
+++ b/test/upload_test.exs
@@ -4,10 +4,10 @@ defmodule Pleroma.UploadTest do
 
   describe "Storing a file" do
     test "copies the file to the configured folder" do
-      file = %Plug.Upload{content_type: "image/jpg", path: Path.absname("test/fixtures/image.jpg"), filename: "an image.jpg"}
+      file = %Plug.Upload{content_type: "image/jpg", path: Path.absname("test/fixtures/image.jpg"), filename: "an [image.jpg"}
       data = Upload.store(file)
-      assert data["name"] == "an image.jpg"
-      assert List.first(data["url"])["href"] == "http://localhost:4001/media/#{data["uuid"]}/an%20image.jpg"
+      assert data["name"] == "an [image.jpg"
+      assert List.first(data["url"])["href"] == "http://localhost:4001/media/#{data["uuid"]}/an%20%5Bimage.jpg"
     end
   end
 end