1 files changed, 5 insertions, 1 deletions
diff --git a/packages/backend/src/server/api/endpoints/pinned-users.ts b/packages/backend/src/server/api/endpoints/pinned-users.ts
index 1d26ab266e..8d253c1f33 100644
--- a/packages/backend/src/server/api/endpoints/pinned-users.ts
+++ b/packages/backend/src/server/api/endpoints/pinned-users.ts
@@ -3,6 +3,7 @@ import { Users } from '@/models/index.js';
 import { fetchMeta } from '@/misc/fetch-meta.js';
 import * as Acct from '@/misc/acct.js';
 import { User } from '@/models/entities/user.js';
+import { IsNull } from 'typeorm';
 
 export const meta = {
 	tags: ['users'],
@@ -30,7 +31,10 @@ export const paramDef = {
 export default define(meta, paramDef, async (ps, me) => {
 	const meta = await fetchMeta();
 
-	const users = await Promise.all(meta.pinnedUsers.map(acct => Users.findOne(Acct.parse(acct))));
+	const users = await Promise.all(meta.pinnedUsers.map(acct => Acct.parse(acct)).map(acct => Users.findOneBy({
+		usernameLower: acct.username.toLowerCase(),
+		host: acct.host ?? IsNull(),
+	})));
 
 	return await Users.packMany(users.filter(x => x !== undefined) as User[], me, { detail: true });
 });