diff --git a/lib/pleroma/web/activity_pub/mrf/hellthread_policy.ex b/lib/pleroma/web/activity_pub/mrf/hellthread_policy.ex
index d5aa2b988..55d6ff3f0 100644
--- a/lib/pleroma/web/activity_pub/mrf/hellthread_policy.ex
+++ b/lib/pleroma/web/activity_pub/mrf/hellthread_policy.ex
@@ -2,13 +2,17 @@ defmodule Pleroma.Web.ActivityPub.MRF.HellthreadPolicy do
   @behaviour Pleroma.Web.ActivityPub.MRF
 
   @impl true
-  def filter(object) do
-    policy = Pleroma.Config.get(:mrf_hellthread)
+  def filter(%{"type" => "Create"} = object) do
+    threshold = Pleroma.Config.get([:mrf_hellthread, :threshold])
+    recipients = (object["to"] || []) ++ (object["cc"] || [])
 
-    if length(object["to"]) + length(object["cc"]) > Keyword.get(policy, :threshold) do
+    if length(recipients) > threshold do
       {:reject, nil}
     else
       {:ok, object}
     end
   end
+
+  @impl true
+  def filter(object), do: {:ok, object}
 end