diff --git a/pyrogram/handlers/message_handler.py b/pyrogram/handlers/message_handler.py
index 3c73b4e8..9b02c155 100644
--- a/pyrogram/handlers/message_handler.py
+++ b/pyrogram/handlers/message_handler.py
@@ -102,7 +102,7 @@ class MessageHandler(Handler):
         """
         listener_does_match = (
             await self.check_if_has_matching_listener(client, message)
-        )[0] if message.chat is not None and message.from_user is not None else False
+        )[0]
 
         if callable(self.filters):
             if iscoroutinefunction(self.filters.__call__):
@@ -129,7 +129,7 @@ class MessageHandler(Handler):
         """
         listener_does_match, listener = await self.check_if_has_matching_listener(
             client, message
-        ) if message.chat is not None and message.from_user is not None else False, None
+        )
 
         if listener and listener_does_match:
             client.remove_listener(listener)