diff --git a/telethon/tl/custom/message.py b/telethon/tl/custom/message.py index 6f536727..df2b3221 100644 --- a/telethon/tl/custom/message.py +++ b/telethon/tl/custom/message.py @@ -268,9 +268,12 @@ class Message(ChatGetter, SenderGetter, TLObject, abc.ABC): The message text, formatted using the client's default parse mode. Will be ``None`` for :tl:`MessageService`. """ - if self._text is None and self._client and self._client.parse_mode: - self._text = self._client.parse_mode.unparse( - self.message, self.entities) + if self._text is None and self._client: + if not self._client.parse_mode: + self._text = self.message + else: + self._text = self._client.parse_mode.unparse( + self.message, self.entities) return self._text