diff --git a/src/actors.js b/src/actors.js index f55824b..623eda3 100644 --- a/src/actors.js +++ b/src/actors.js @@ -559,6 +559,8 @@ export async function mergeActors(targetActorId, sourceActorId, reqUser) { const [targetActor, sourceActor] = await Promise.all([ knex('actors') .where('id', targetActorId) + .whereNull('entity_id') + .whereNull('alias_for') .first(), knex('actors') .where('id', sourceActorId)