diff --git a/redbot/cogs/mod/events.py b/redbot/cogs/mod/events.py
index 80b742b97fb..199006ef559 100644
--- a/redbot/cogs/mod/events.py
+++ b/redbot/cogs/mod/events.py
@@ -46,12 +46,12 @@ async def check_mention_spam(self, message):
         mention_spam = await self.config.guild(guild).mention_spam.all()
 
         if mention_spam["strict"]:  # if strict is enabled
-            mentions = message.raw_mentions
+            mentions = len(message.raw_mentions) + len(message.raw_role_mentions)
         else:  # if not enabled
-            mentions = set(message.mentions)
+            mentions = len(set(message.mentions)) + len(set(message.role_mentions))
 
         if mention_spam["ban"]:
-            if len(mentions) >= mention_spam["ban"]:
+            if mentions >= mention_spam["ban"]:
                 try:
                     await guild.ban(author, reason=_("Mention spam (Autoban)"))
                 except discord.HTTPException:
@@ -75,7 +75,7 @@ async def check_mention_spam(self, message):
                     return True
 
         if mention_spam["kick"]:
-            if len(mentions) >= mention_spam["kick"]:
+            if mentions >= mention_spam["kick"]:
                 try:
                     await guild.kick(author, reason=_("Mention Spam (Autokick)"))
                 except discord.HTTPException:
@@ -99,7 +99,7 @@ async def check_mention_spam(self, message):
                     return True
 
         if mention_spam["warn"]:
-            if len(mentions) >= mention_spam["warn"]:
+            if mentions >= mention_spam["warn"]:
                 try:
                     await author.send(_("Please do not mass mention people!"))
                 except (discord.HTTPException, discord.Forbidden):