diff --git a/src/scanners/channels_scanner.py b/src/scanners/channels_scanner.py
index 1b29542..6211221 100644
--- a/src/scanners/channels_scanner.py
+++ b/src/scanners/channels_scanner.py
@@ -81,7 +81,11 @@ class ChannelsScanner(Scanner):
         all_messages: bool,
     ) -> bool:
         impacted = False
-        if not message.bot or all_messages:
+        if (
+            len(raw_members) == 0
+            and (not message.bot or all_messages)
+            or message.author in raw_members
+        ):
             impacted = True
             messages[channel_id].update_use(1, message.created_at, message.author)
         return impacted
diff --git a/src/scanners/messages_scanner.py b/src/scanners/messages_scanner.py
index 7e05cb9..c04e825 100644
--- a/src/scanners/messages_scanner.py
+++ b/src/scanners/messages_scanner.py
@@ -81,7 +81,11 @@ class MessagesScanner(Scanner):
         all_messages: bool,
     ) -> bool:
         impacted = False
-        if not message.bot or all_messages:
+        if (
+            len(raw_members) == 0
+            and (not message.bot or all_messages)
+            or message.author in raw_members
+        ):
             impacted = True
             messages[message.author].update_use(1, message.created_at, channel_id)
         return impacted