diff --git a/src/remote/activitypub/models/person.ts b/src/remote/activitypub/models/person.ts
index 51a9efa10..fbc329e86 100644
--- a/src/remote/activitypub/models/person.ts
+++ b/src/remote/activitypub/models/person.ts
@@ -159,18 +159,6 @@ export async function createPerson(uri: string, resolver?: Resolver): Promise<Us
 			isBot,
 			isCat: (person as any).isCat === true
 		} as Partial<User>) as IRemoteUser;
-
-		await UserPublickeys.save({
-			id: genId(),
-			userId: user.id,
-			keyId: person.publicKey.id,
-			keyPem: person.publicKey.publicKeyPem
-		} as UserPublickey);
-
-		await UserServiceLinkings.save({
-			id: genId(),
-			userId: user.id,
-		} as UserServiceLinking);
 	} catch (e) {
 		// duplicate key error
 		if (isDuplicateKeyValueError(e)) {
@@ -181,6 +169,13 @@ export async function createPerson(uri: string, resolver?: Resolver): Promise<Us
 		throw e;
 	}
 
+	await UserPublickeys.save({
+		id: genId(),
+		userId: user.id,
+		keyId: person.publicKey.id,
+		keyPem: person.publicKey.publicKeyPem
+	} as UserPublickey);
+
 	await UserServiceLinkings.save({
 		id: genId(),
 		userId: user.id