diff --git a/lib/pleroma/web/media_proxy/media_proxy.ex b/lib/pleroma/web/media_proxy/media_proxy.ex
index cee6d8481..dd8888a02 100644
--- a/lib/pleroma/web/media_proxy/media_proxy.ex
+++ b/lib/pleroma/web/media_proxy/media_proxy.ex
@@ -33,20 +33,7 @@ defp whitelisted?(url) do
 
   def encode_url(url) do
     secret = Pleroma.Config.get([Pleroma.Web.Endpoint, :secret_key_base])
-
-    # Must preserve `%2F` for compatibility with S3
-    # https://git.pleroma.social/pleroma/pleroma/issues/580
-    replacement = get_replacement(url, ":2F:")
-
-    # The URL is url-decoded and encoded again to ensure it is correctly encoded and not twice.
-    base64 =
-      url
-      |> String.replace("%2F", replacement)
-      |> URI.decode()
-      |> URI.encode()
-      |> String.replace(replacement, "%2F")
-      |> Base.url_encode64(@base64_opts)
-
+    base64 = Base.url_encode64(url, @base64_opts)
     sig = :crypto.hmac(:sha, secret, base64)
     sig64 = sig |> Base.url_encode64(@base64_opts)
 
@@ -80,12 +67,4 @@ def build_url(sig_base64, url_base64, filename \\ nil) do
     |> Enum.filter(fn value -> value end)
     |> Path.join()
   end
-
-  defp get_replacement(url, replacement) do
-    if String.contains?(url, replacement) do
-      get_replacement(url, replacement <> replacement)
-    else
-      replacement
-    end
-  end
 end
diff --git a/test/media_proxy_test.exs b/test/media_proxy_test.exs
index b23aeb88b..cd1cbd202 100644
--- a/test/media_proxy_test.exs
+++ b/test/media_proxy_test.exs
@@ -70,9 +70,12 @@ test "encodes and decodes URL and ignores query params for the path" do
       assert decode_result(encoded) == url
     end
 
-    test "ensures urls are url-encoded" do
+    # Some of the signed url expect the special character in the url to be same
+    # for the proxy to work.
+    # Issue https://git.pleroma.social/pleroma/pleroma/issues/1055
+    test "ensures urls are maintained (character are not encoded or decoded)" do
       assert decode_result(url("https://pleroma.social/Hello world.jpg")) ==
-               "https://pleroma.social/Hello%20world.jpg"
+               "https://pleroma.social/Hello world.jpg"
 
       assert decode_result(url("https://pleroma.social/Hello%20world.jpg")) ==
                "https://pleroma.social/Hello%20world.jpg"