diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index b2f59ab6b..0d11101a3 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -472,7 +472,7 @@ def get_notified_from_activity_query(to) do
     )
   end
 
-  def get_notified_from_activity(%Activity{recipients: to, data: %{"type" => "Announce"} = data}) do
+  def get_notified_from_activity(%Activity{data: %{"type" => "Announce", "to" => to} = data}) do
     object = Object.normalize(data["object"])
     actor = User.get_cached_by_ap_id(data["actor"])
 
@@ -490,12 +490,14 @@ def get_notified_from_activity(%Activity{recipients: to, data: %{"type" => "Anno
     Repo.all(query)
   end
 
-  def get_notified_from_activity(%Activity{recipients: to}) do
+  def get_notified_from_activity(%Activity{data: %{"to" => to}}) do
     query = get_notified_from_activity_query(to)
 
     Repo.all(query)
   end
 
+  def get_notified_from_activity(_), do: []
+
   def get_recipients_from_activity(%Activity{recipients: to}) do
     query =
       from(