diff --git a/lib/pleroma/web/federator.ex b/lib/pleroma/web/federator.ex
index adf8298da..ce1dd8fa8 100644
--- a/lib/pleroma/web/federator.ex
+++ b/lib/pleroma/web/federator.ex
@@ -117,7 +117,11 @@ def perform(:incoming_ap_doc, params) do
       e ->
         # Just drop those for now
         Logger.debug(fn -> "Unhandled activity\n" <> Jason.encode!(params, pretty: true) end)
-        {:error, e}
+
+        case e do
+          {:error, _} -> e
+          _ -> {:error, e}
+        end
     end
   end
 end
diff --git a/lib/pleroma/workers/receiver_worker.ex b/lib/pleroma/workers/receiver_worker.ex
index 6a8f89a03..3eccba812 100644
--- a/lib/pleroma/workers/receiver_worker.ex
+++ b/lib/pleroma/workers/receiver_worker.ex
@@ -24,13 +24,13 @@ def perform(%Job{args: %{"op" => "incoming_ap_doc", "params" => params}}) do
         {:discard, :already_present}
 
       # invalid data or e.g. deleting an object we don't know about anyway
-      {:error, {:error, {:validate, issue}}} ->
+      {:error, {:validate, issue}} ->
         Logger.info("Received invalid AP document: #{inspect(issue)}")
         {:discard, :invalid}
 
       # rarer, but sometimes there’s an additional :error in front
-      {:error, {:error, {:error, {:validate, issue}}}} ->
-        Logger.info("Received invalid AP document: (3e) #{inspect(issue)}")
+      {:error, {:error, {:validate, issue}}} ->
+        Logger.info("Received invalid AP document: (2e) #{inspect(issue)}")
         {:discard, :invalid}
 
       {:error, _} = e ->