diff --git a/pyrogram/types/user_and_chats/emoji_status.py b/pyrogram/types/user_and_chats/emoji_status.py
index f69b385db..363d53396 100644
--- a/pyrogram/types/user_and_chats/emoji_status.py
+++ b/pyrogram/types/user_and_chats/emoji_status.py
@@ -52,27 +52,16 @@ def __init__(
     @staticmethod
     def _parse(client, emoji_status: "raw.base.EmojiStatus") -> Optional["EmojiStatus"]:
         if isinstance(emoji_status, raw.types.EmojiStatus):
-            return EmojiStatus(
-                client=client,
-                custom_emoji_id=emoji_status.document_id
-            )
-
-        if isinstance(emoji_status, raw.types.EmojiStatusUntil):
             return EmojiStatus(
                 client=client,
                 custom_emoji_id=emoji_status.document_id,
-                until_date=utils.timestamp_to_datetime(emoji_status.until)
+                until_date=utils.timestamp_to_datetime(emoji_status.until) if emoji_status.until else None
             )
 
         return None
 
     def write(self):
-        if self.until_date:
-            return raw.types.EmojiStatusUntil(
-                document_id=self.custom_emoji_id,
-                until=utils.datetime_to_timestamp(self.until_date)
-            )
-
         return raw.types.EmojiStatus(
-            document_id=self.custom_emoji_id
+            document_id=self.custom_emoji_id,
+            until=utils.datetime_to_timestamp(self.until_date) if self.until_date else None
         )