diff --git a/Sources/ChatUI/ChatInChannel/MessageDateView.swift b/Sources/ChatUI/ChatInChannel/MessageDateView.swift
index f907464..16f2297 100644
--- a/Sources/ChatUI/ChatInChannel/MessageDateView.swift
+++ b/Sources/ChatUI/ChatInChannel/MessageDateView.swift
@@ -21,7 +21,7 @@ public struct MessageDateView<MessageType: MessageProtocol>: View {
     }
     
     public init(message: MessageType) {
-        self.date = Date(timeIntervalSince1970: message.sentAt / 1000)
+        self.date = Date(timeIntervalSince1970: message.sentAt)
     }
 }
 
diff --git a/Sources/ChatUI/ChatInChannel/MessageList.swift b/Sources/ChatUI/ChatInChannel/MessageList.swift
index 597488c..282d2a7 100644
--- a/Sources/ChatUI/ChatInChannel/MessageList.swift
+++ b/Sources/ChatUI/ChatInChannel/MessageList.swift
@@ -146,7 +146,7 @@ public struct MessageList<MessageType: MessageProtocol & Identifiable, RowConten
                     // presenting view as an overlay, so that it will look like custom context
                     VStack(alignment: configuration.userID == highlightMessage.sender.id ? .trailing : .leading, spacing: 0) {
                         // MARK: Message Reaction
-                        if highlightMessage.readReceipt == .seen {
+                        if highlightMessage.readReceipt == .seen, !reactionItems.isEmpty {
                             ReactionSelector(isPresented: $isMessageMenuPresented, message: highlightMessage, items: reactionItems) { reactionItem in
                                 // MARK: Close Highlight
                                 withAnimation(.easeInOut) {