diff --git a/src/models/user.ts b/src/models/user.ts
index 906bcb533..ea59730e4 100644
--- a/src/models/user.ts
+++ b/src/models/user.ts
@@ -12,6 +12,7 @@ const User = db.get<IUser>('users');
 
 User.createIndex('username');
 User.createIndex('token');
+User.createIndex('uri', { sparse: true, unique: true });
 
 export default User;
 
diff --git a/src/remote/activitypub/resolve-person.ts b/src/remote/activitypub/resolve-person.ts
index 0140811f0..50e7873cb 100644
--- a/src/remote/activitypub/resolve-person.ts
+++ b/src/remote/activitypub/resolve-person.ts
@@ -12,6 +12,14 @@ export default async (value: string | IObject, verifier?: string): Promise<IUser
 
 	if (id.startsWith(config.url + '/')) {
 		return await User.findOne({ _id: id.split('/').pop() });
+	} else {
+		const exist = await User.findOne({
+			uri: id
+		});
+
+		if (exist) {
+			return exist;
+		}
 	}
 
 	const resolver = new Resolver();