diff --git a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/RawMessage.kt b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/RawMessage.kt
index 15990b923a..d6d707a473 100644
--- a/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/RawMessage.kt
+++ b/tgbotapi.core/src/commonMain/kotlin/dev/inmo/tgbotapi/types/message/RawMessage.kt
@@ -351,6 +351,13 @@ internal data class RawMessage(
         try {
             chatEvent ?.let { chatEvent ->
                 when (chat) {
+                    is PreviewChannelDirectMessagesChat -> CommonChannelDirectMessagesEventMessage(
+                        messageId,
+                        checkedFrom ?: from ?: error("Channel direct messages events are expected to contain 'from' field"),
+                        chat,
+                        chatEvent as? ChannelDirectMessagesEvent ?: throwWrongChatEvent(PreviewChannelDirectMessagesChat::class, chatEvent),
+                        date.asDate
+                    )
                     is PreviewSupergroupChat -> CommonSupergroupEventMessage(
                         messageId,
                         checkedFrom ?: from ?: error("Supergroup events are expected to contain 'from' field"),
@@ -365,14 +372,6 @@ internal data class RawMessage(
                         chatEvent as? GroupEvent ?: throwWrongChatEvent(GroupChat::class, chatEvent),
                         date.asDate
                     )
-                    is PreviewChannelDirectMessagesChat -> CommonChannelDirectMessagesEventMessage(
-                        messageId,
-                        //TODO:: Check that all channel direct messages events coming with "from" field
-                        checkedFrom ?: from ?: error("Channel direct messages events are expected to contain 'from' field"),
-                        chat,
-                        chatEvent as? ChannelDirectMessagesEvent ?: throwWrongChatEvent(PreviewChannelDirectMessagesChat::class, chatEvent),
-                        date.asDate
-                    )
                     is PreviewChannelChat -> ChannelEventMessage(
                         messageId,
                         chat,