diff --git a/server/queues/tasks/CommentCreatedNotificationsTask.ts b/server/queues/tasks/CommentCreatedNotificationsTask.ts
index 6a4ebc88c..008bcd4a7 100644
--- a/server/queues/tasks/CommentCreatedNotificationsTask.ts
+++ b/server/queues/tasks/CommentCreatedNotificationsTask.ts
@@ -40,6 +40,10 @@ export default class CommentCreatedNotificationsTask extends BaseTask<CommentEve
     const userIdsMentioned: string[] = [];
 
     for (const mention of mentions) {
+      if (userIdsMentioned.includes(mention.modelId)) {
+        continue;
+      }
+
       const recipient = await User.findByPk(mention.modelId);
 
       if (
diff --git a/server/queues/tasks/CommentUpdatedNotificationsTask.ts b/server/queues/tasks/CommentUpdatedNotificationsTask.ts
index 85acf21b0..5cc230b81 100644
--- a/server/queues/tasks/CommentUpdatedNotificationsTask.ts
+++ b/server/queues/tasks/CommentUpdatedNotificationsTask.ts
@@ -21,11 +21,13 @@ export default class CommentUpdatedNotificationsTask extends BaseTask<CommentEve
     const mentions = ProsemirrorHelper.parseMentions(
       ProsemirrorHelper.toProsemirror(comment.data)
     ).filter((mention) => event.data.newMentionIds.includes(mention.id));
-    if (mentions.length === 0) {
-      return;
-    }
+    const userIdsMentioned: string[] = [];
 
     for (const mention of mentions) {
+      if (userIdsMentioned.includes(mention.modelId)) {
+        continue;
+      }
+
       const recipient = await User.findByPk(mention.modelId);
 
       if (
diff --git a/server/queues/tasks/DocumentPublishedNotificationsTask.ts b/server/queues/tasks/DocumentPublishedNotificationsTask.ts
index 35486bb4c..2cfed43d4 100644
--- a/server/queues/tasks/DocumentPublishedNotificationsTask.ts
+++ b/server/queues/tasks/DocumentPublishedNotificationsTask.ts
@@ -22,6 +22,10 @@ export default class DocumentPublishedNotificationsTask extends BaseTask<Documen
     const userIdsMentioned: string[] = [];
 
     for (const mention of mentions) {
+      if (userIdsMentioned.includes(mention.modelId)) {
+        continue;
+      }
+
       const recipient = await User.findByPk(mention.modelId);
 
       if (
diff --git a/server/queues/tasks/RevisionCreatedNotificationsTask.ts b/server/queues/tasks/RevisionCreatedNotificationsTask.ts
index 6377a815d..f4f44ac3e 100644
--- a/server/queues/tasks/RevisionCreatedNotificationsTask.ts
+++ b/server/queues/tasks/RevisionCreatedNotificationsTask.ts
@@ -32,6 +32,10 @@ export default class RevisionCreatedNotificationsTask extends BaseTask<RevisionE
     const userIdsMentioned: string[] = [];
 
     for (const mention of mentions) {
+      if (userIdsMentioned.includes(mention.modelId)) {
+        continue;
+      }
+
       const recipient = await User.findByPk(mention.modelId);
       if (
         recipient &&