diff --git a/src/actors.js b/src/actors.js
index 2d1f47ae6..802b0065b 100644
--- a/src/actors.js
+++ b/src/actors.js
@@ -960,7 +960,11 @@ async function flushProfiles(actorIdsOrNames) {
 async function flushActors(actorIdsOrNames) {
 	const actors = await knex('actors')
 		.whereIn('id', actorIdsOrNames.filter(idOrName => typeof idOrName === 'number'))
-		.orWhereIn('name', actorIdsOrNames.filter(idOrName => typeof idOrName === 'string'));
+		.orWhere((builder) => {
+			builder
+				.whereIn('name', actorIdsOrNames.filter(idOrName => typeof idOrName === 'string'))
+				.whereNull('entity_id');
+		});
 
 	const actorIds = actors.map(actor => actor.id);