diff --git a/apps/meteor/client/components/message/content/reactions/Reaction.tsx b/apps/meteor/client/components/message/content/reactions/Reaction.tsx
index e0f954e8f97..ce61ee4d77d 100644
--- a/apps/meteor/client/components/message/content/reactions/Reaction.tsx
+++ b/apps/meteor/client/components/message/content/reactions/Reaction.tsx
@@ -9,6 +9,8 @@ import ReactionTooltip from './ReactionTooltip';
 import { getEmojiClassNameAndDataTitle } from '../../../../lib/utils/renderEmoji';
 import { MessageListContext } from '../../list/MessageListContext';
 
+const normalizeUsernames = (names: string[]) => names.map((name) => (name.startsWith('@') ? name.slice(1) : name));
+
 // TODO: replace it with proper usage of i18next plurals
 type ReactionProps = {
 	hasReacted: (name: string) => boolean;
@@ -47,7 +49,7 @@ const Reaction = ({ hasReacted, counter, name, names, messageId, onClick, ...pro
 					openTooltip(
 						<ReactionTooltip
 							emojiName={name}
-							usernames={names}
+							usernames={normalizeUsernames(names)}
 							mine={mine}
 							messageId={messageId}
 							showRealName={showRealName}
diff --git a/apps/meteor/client/components/message/toolbar/useShowMessageReactionsAction.tsx b/apps/meteor/client/components/message/toolbar/useShowMessageReactionsAction.tsx
index fd9bbd781dd..3b694c9b9fb 100644
--- a/apps/meteor/client/components/message/toolbar/useShowMessageReactionsAction.tsx
+++ b/apps/meteor/client/components/message/toolbar/useShowMessageReactionsAction.tsx
@@ -15,7 +15,7 @@ export const useShowMessageReactionsAction = (message: IMessage): MessageActionC
 		id: 'reaction-list',
 		icon: 'emoji',
 		label: 'Reactions',
-		context: ['message', 'message-mobile', 'threads', 'videoconf', 'videoconf-threads'],
+		context: ['message', 'message-mobile', 'threads', 'videoconf', 'videoconf-threads', 'federated'],
 		type: 'interaction',
 		action() {
 			setModal(