diff --git a/lib/pleroma/uploaders/mdii.ex b/lib/pleroma/uploaders/mdii.ex
index f1f996fca..71f3d1be7 100644
--- a/lib/pleroma/uploaders/mdii.ex
+++ b/lib/pleroma/uploaders/mdii.ex
@@ -11,11 +11,11 @@ def put_file(name, uuid, path, content_type, _should_dedupe) do
 
     File.rm!(path)
 
-    extension = Regex.replace(~r/^image\//, content_type, "")
+    extension = String.split(name, ".") |> List.last()
     query = "https://#{host_name}/mdii-post.cgi?#{extension}"
 
     with {:ok, %{status_code: 200, body: body}} <- @httpoison.post(query, file_data) do
-      remote_file_name = List.first(String.split(body))
+      remote_file_name = String.split(body) |> List.first()
       public_url = "https://#{host_name}/#{remote_file_name}.#{extension}"
       {:ok, public_url}
     end