diff --git a/lib/pleroma/web/web_finger/web_finger_controller.ex b/lib/pleroma/web/web_finger/web_finger_controller.ex
index 0a9ee2d3b8..8a291e28e7 100644
--- a/lib/pleroma/web/web_finger/web_finger_controller.ex
+++ b/lib/pleroma/web/web_finger/web_finger_controller.ex
@@ -42,15 +42,8 @@ defmodule Pleroma.Web.WebFinger.WebFingerController do
   end
 
   # Default to JSON when no format is specified or format is not recognized
-  def webfinger(%{assigns: %{format: _format}} = conn, %{"resource" => resource}) do
-    with {:ok, response} <- WebFinger.webfinger(resource, "JSON") do
-      json(conn, response)
-    else
-      _e ->
-        conn
-        |> put_status(404)
-        |> json("Couldn't find user")
-    end
+  def webfinger(%{assigns: %{format: _format}} = conn, %{"resource" => _resource} = params) do
+    webfinger(put_in(conn.assigns.format, "json"), params)
   end
 
   def webfinger(conn, _params), do: send_resp(conn, 400, "Bad Request")