diff --git a/telethon/tl/custom/message.py b/telethon/tl/custom/message.py
index fa555c78..03a40404 100644
--- a/telethon/tl/custom/message.py
+++ b/telethon/tl/custom/message.py
@@ -617,21 +617,14 @@ class Message:
                 >>> for _, inner_text in m.get_entities_text(MessageEntityCode):
                 >>>     print(inner_text)
         """
-        entities_list = self.original_message.entities
-        
         if not self.original_message.entities:
             return []
 
-        if cls and self.original_message.entities:
-            entities_list = [c for c in self.original_message.entities 
-                             if isinstance(c, cls)]
-            texts = get_inner_text(
-                self.original_message.message,
-                entities_list
-            )
-        else:
-            texts = get_inner_text(entities_list,
-                                   self.original_message.entities)
+        ent = self.original_message.entities
+        if cls and ent:
+            ent = [c for c in ent if isinstance(c, cls)]
+
+        texts = get_inner_text(self.original_message.message, ent)
         return list(zip(entities_list, texts))
 
     async def click(self, i=None, j=None, *, text=None, filter=None):