diff --git a/lib/shared/user-utils.js b/lib/shared/user-utils.js
index 9cc62467b..779e28f75 100644
--- a/lib/shared/user-utils.js
+++ b/lib/shared/user-utils.js
@@ -1,45 +1,48 @@
 // @flow
 
-import { memberHasAdminPowers } from './thread-utils.js';
+import { roleIsAdminRole } from './thread-utils.js';
 import { useENSNames } from '../hooks/ens-cache.js';
 import type {
   ThreadInfo,
   RawThreadInfo,
 } from '../types/minimally-encoded-thread-permissions-types.js';
 import type { UserInfo } from '../types/user-types.js';
 import { useSelector } from '../utils/redux-utils.js';
 
 function stringForUser(
   user: ?{
     +username?: ?string,
     +isViewer?: ?boolean,
     ...
   },
 ): string {
   if (user?.isViewer) {
     return 'you';
   }
 
   return stringForUserExplicit(user);
 }
 
 function stringForUserExplicit(user: ?{ +username: ?string, ... }): string {
   if (user?.username) {
     return user.username;
   }
 
   return 'anonymous';
 }
 
 function useKeyserverAdmin(community: ThreadInfo | RawThreadInfo): ?UserInfo {
   const userInfos = useSelector(state => state.userStore.userInfos);
   // This hack only works as long as there is only one admin
   // Linear task to revert this:
   // https://linear.app/comm/issue/ENG-1707/revert-fix-getting-the-keyserver-admin-info
-  const admin = community.members.find(memberHasAdminPowers);
+  const { roles, members } = community;
+  const admin = members.find(member =>
+    member.role ? roleIsAdminRole(roles[member.role]) : false,
+  );
   const adminUserInfo = admin ? userInfos[admin.id] : undefined;
   const [adminUserInfoWithENSName] = useENSNames([adminUserInfo]);
   return adminUserInfoWithENSName;
 }
 
 export { stringForUser, stringForUserExplicit, useKeyserverAdmin };