diff --git a/files/classes/user.py b/files/classes/user.py
index 963cd58fc..2fea4e1cc 100644
--- a/files/classes/user.py
+++ b/files/classes/user.py
@@ -785,11 +785,11 @@ class User(Base):
 	def modmail_notifications_count(self):
 		if self.admin_level < PERMS['NOTIFICATIONS_MODMAIL']:
 			return 0
-		return g.db.query(Comment).distinct(Comment.top_comment_id).filter(
+		return g.db.query(Comment.top_comment_id).filter(
 				Comment.author_id != self.id,
 				Comment.sentto == MODMAIL_ID,
 				Comment.created_utc > self.last_viewed_modmail_notifs,
-			).count()
+			).group_by(Comment.top_comment_id).count()
 
 	@property
 	@lazy