diff --git a/app/soapbox/features/chats/components/__tests__/chat-message-list.test.tsx b/app/soapbox/features/chats/components/__tests__/chat-message-list.test.tsx
index 1feead076..d538bee34 100644
--- a/app/soapbox/features/chats/components/__tests__/chat-message-list.test.tsx
+++ b/app/soapbox/features/chats/components/__tests__/chat-message-list.test.tsx
@@ -71,7 +71,7 @@ Object.assign(navigator, {
 
 const store = rootState
   .set('me', '1')
-  .set('instance', normalizeInstance({ version: '3.4.1 (compatible; TruthSocial 1.0.0)' }));
+  .set('instance', normalizeInstance({ version: '3.4.1 (compatible; TruthSocial 1.0.0+unreleased)' }));
 
 const renderComponentWithChatContext = () => render(
   <VirtuosoMockContext.Provider value={{ viewportHeight: 300, itemHeight: 100 }}>
diff --git a/app/soapbox/features/chats/components/chat-message.tsx b/app/soapbox/features/chats/components/chat-message.tsx
index e7ad0af12..597c78ef1 100644
--- a/app/soapbox/features/chats/components/chat-message.tsx
+++ b/app/soapbox/features/chats/components/chat-message.tsx
@@ -307,7 +307,7 @@ const ChatMessage = (props: IChatMessage) => {
           </Stack>
         </HStack>
 
-        {(chatMessage.emoji_reactions.size > 0) ? (
+        {(chatMessage.emoji_reactions?.size) ? (
           <div
             className={clsx({
               'space-y-1': true,
diff --git a/app/soapbox/normalizers/chat-message.ts b/app/soapbox/normalizers/chat-message.ts
index 58054f969..642ae0bb3 100644
--- a/app/soapbox/normalizers/chat-message.ts
+++ b/app/soapbox/normalizers/chat-message.ts
@@ -20,7 +20,7 @@ export const ChatMessageRecord = ImmutableRecord({
   created_at: '',
   emojis: ImmutableList<Emoji>(),
   expiration: null as number | null,
-  emoji_reactions: ImmutableList<EmojiReaction>(),
+  emoji_reactions: null as ImmutableList<EmojiReaction> | null,
   id: '',
   unread: false,
   deleting: false,