diff --git a/ts/components/conversation/Message.tsx b/ts/components/conversation/Message.tsx
index 8fa9bc3a4..dc07386ab 100644
--- a/ts/components/conversation/Message.tsx
+++ b/ts/components/conversation/Message.tsx
@@ -221,6 +221,7 @@ export type PropsData = {
   isSpoilerExpanded?: Record<number, boolean>;
   direction: DirectionType;
   timestamp: number;
+  receivedAtMS?: number;
   status?: MessageStatusType;
   contact?: EmbeddedContactType;
   author: Pick<
diff --git a/ts/state/selectors/message.ts b/ts/state/selectors/message.ts
index ec7dfa3fc..01a534c90 100644
--- a/ts/state/selectors/message.ts
+++ b/ts/state/selectors/message.ts
@@ -764,6 +764,7 @@ export const getPropsForMessage = (
     text: message.body,
     textDirection: getTextDirection(message.body),
     timestamp: getMessageSentTimestamp(message, { includeEdits: true, log }),
+    receivedAtMS: message.received_at_ms,
   };
 };
 
diff --git a/ts/state/smart/TypingBubble.tsx b/ts/state/smart/TypingBubble.tsx
index 0743fa5fb..15714d620 100644
--- a/ts/state/smart/TypingBubble.tsx
+++ b/ts/state/smart/TypingBubble.tsx
@@ -44,8 +44,8 @@ export function SmartTypingBubble({
     if ('author' in lastItem.data) {
       lastItemAuthorId = lastItem.data.author?.id;
     }
-    if ('timestamp' in lastItem.data) {
-      lastItemTimestamp = lastItem.data.timestamp;
+    if ('receivedAtMS' in lastItem.data) {
+      lastItemTimestamp = lastItem.data.receivedAtMS;
     }
   }