diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index bf5b6508b..ef5a02249 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -2279,6 +2279,7 @@ def ensure_keys_present(%User{} = user) do
   def get_ap_ids_by_nicknames(nicknames) do
     from(u in User,
       where: u.nickname in ^nicknames,
+      order_by: fragment("array_position(?, ?)", ^nicknames, u.nickname),
       select: u.ap_id
     )
     |> Repo.all()