diff --git a/app/actions/remote/user.ts b/app/actions/remote/user.ts
index 925288d1d..195f316a2 100644
--- a/app/actions/remote/user.ts
+++ b/app/actions/remote/user.ts
@@ -451,7 +451,7 @@ export const fetchUsersByUsernames = async (serverUrl: string, usernames: string
 
         const users = await client.getProfilesByUsernames([...new Set(usersToLoad)]);
 
-        if (!fetchOnly) {
+        if (users.length && !fetchOnly) {
             await operator.handleUsers({
                 users,
                 prepareRecordsOnly: false,
diff --git a/app/components/markdown/at_mention/at_mention.tsx b/app/components/markdown/at_mention/at_mention.tsx
index c08e7a061..1fb871653 100644
--- a/app/components/markdown/at_mention/at_mention.tsx
+++ b/app/components/markdown/at_mention/at_mention.tsx
@@ -142,7 +142,7 @@ const AtMention = ({
     // Effects
     useEffect(() => {
         // Fetches and updates the local db store with the mention
-        if (!user.username) {
+        if (!user.username && !group?.name) {
             fetchUserOrGroupsByMentionsInBatch(serverUrl, mentionName);
         }
     }, []);