diff --git a/telethon/events/common.py b/telethon/events/common.py
index fc93d0df..4df12836 100644
--- a/telethon/events/common.py
+++ b/telethon/events/common.py
@@ -127,7 +127,8 @@ class EventCommon(abc.ABC):
             except ValueError:
                 ch = isinstance(self._chat_peer, types.PeerChannel)
                 if not ch and self._message_id is not None:
-                    msg = await self._client.get_messages(ids=self._message_id)
+                    msg = await self._client.get_messages(
+                        None, ids=self._message_id)
                     self._chat = msg._chat
                     self._input_chat = msg._input_chat
                 else:
diff --git a/telethon/tl/custom/message.py b/telethon/tl/custom/message.py
index 1c767fbd..18ca2600 100644
--- a/telethon/tl/custom/message.py
+++ b/telethon/tl/custom/message.py
@@ -37,7 +37,11 @@ class Message:
             self._input_sender = get_input_peer(self._sender)
         else:
             self._input_sender = None
+
         self._input_chat = input_chat
+        if not self._input_chat and self._chat:
+            self._input_chat = get_input_peer(self._chat)
+
         self._fwd_from_entity = None
         if getattr(self.original_message, 'fwd_from', None):
             fwd = self.original_message.fwd_from