diff --git a/src/modules/stream_notifications/messages_proc.py b/src/modules/stream_notifications/messages_proc.py
index ba8d091..5880033 100644
--- a/src/modules/stream_notifications/messages_proc.py
+++ b/src/modules/stream_notifications/messages_proc.py
@@ -157,7 +157,10 @@ class MessagesProc:
         if message is None:
             return []
 
-        return [message for message in cls.MESSAGE_HISTORY if message["thread_id"] == message_id] + [message]
+        return (
+            [message for message in cls.MESSAGE_HISTORY if message["thread_id"] == message_id]
+            + [message for message in cls.MESSAGE_HISTORY if message["id"] == message_id]
+        )
 
     @classmethod
     async def on_message(cls, event: MessageEvent):