diff --git a/ts/components/leftpane/conversation-list-item/HeaderItem.tsx b/ts/components/leftpane/conversation-list-item/HeaderItem.tsx
index c6bb9034c..b0a1eee31 100644
--- a/ts/components/leftpane/conversation-list-item/HeaderItem.tsx
+++ b/ts/components/leftpane/conversation-list-item/HeaderItem.tsx
@@ -5,6 +5,7 @@ import styled from 'styled-components';
 import { Data } from '../../../data/data';
 import { useConversationPropsById, useIsPinned } from '../../../hooks/useParamSelector';
 import { getUsBlindedInThatServer } from '../../../session/apis/open_group_api/sogsv3/knownBlindedkeys';
+import { CONVERSATION } from '../../../session/constants';
 import { UserUtils } from '../../../session/utils';
 import {
   openConversationToSpecificMessage,
@@ -170,7 +171,11 @@ export const ConversationListItemHeaderItem = () => {
         @
       </MentionAtSymbol>
     ) : null;
-    unreadCountDiv = <p className="module-conversation-list-item__unread-count">{unreadCount}</p>;
+    unreadCountDiv = (
+      <p className="module-conversation-list-item__unread-count">
+        {unreadCount > CONVERSATION.MAX_UNREAD_COUNT ? `${CONVERSATION.MAX_UNREAD_COUNT}+` : unreadCount}
+      </p>
+    );
   }
 
   return (
diff --git a/ts/session/constants.ts b/ts/session/constants.ts
index 35bd981fb..72b546a9d 100644
--- a/ts/session/constants.ts
+++ b/ts/session/constants.ts
@@ -39,6 +39,7 @@ export const CONVERSATION = {
   // Maximum voice message duraton of 5 minutes
   // which equates to 1.97 MB
   MAX_VOICE_MESSAGE_DURATION: 300,
+  MAX_UNREAD_COUNT: 9999,
 };
 // Max attachment size: 6 MB