diff --git a/packages/backend/src/server/api/mastodon/helpers/search.ts b/packages/backend/src/server/api/mastodon/helpers/search.ts
index 576810087..9924c434c 100644
--- a/packages/backend/src/server/api/mastodon/helpers/search.ts
+++ b/packages/backend/src/server/api/mastodon/helpers/search.ts
@@ -106,7 +106,7 @@ export class SearchHelpers {
         query.andWhere(
             new Brackets((qb) => {
                 qb.where("user.name ILIKE :q", { q: `%${sqlLikeEscape(q)}%` });
-                qb.orWhere("user.usernameLower ILIKE :q", { q: `%${sqlLikeEscape(q)}%` });
+                qb.orWhere("concat_ws('@', user.usernameLower, user.host) ILIKE :q", { q: `%${sqlLikeEscape(q)}%` });
             })
         );