diff --git a/Signal/src/ViewControllers/ConversationView/MessagesViewController.m b/Signal/src/ViewControllers/ConversationView/MessagesViewController.m
index ae0e1e3aae..65e59c7836 100644
--- a/Signal/src/ViewControllers/ConversationView/MessagesViewController.m
+++ b/Signal/src/ViewControllers/ConversationView/MessagesViewController.m
@@ -3812,7 +3812,8 @@ typedef enum : NSUInteger {
 - (void)updateBackButtonUnreadCount
 {
     AssertIsOnMainThread();
-    self.backButtonUnreadCount = [self.messagesManager unreadMessagesCountExcept:self.thread];
+    // Max out the unread count at 99.
+    self.backButtonUnreadCount = MIN((NSUInteger)99, [self.messagesManager unreadMessagesCountExcept:self.thread]);
 }
 
 - (void)setBackButtonUnreadCount:(NSUInteger)unreadCount
diff --git a/Signal/src/ViewControllers/InboxTableViewCell.m b/Signal/src/ViewControllers/InboxTableViewCell.m
index 2be8a27def..f97b43fc42 100644
--- a/Signal/src/ViewControllers/InboxTableViewCell.m
+++ b/Signal/src/ViewControllers/InboxTableViewCell.m
@@ -117,6 +117,8 @@ const NSUInteger kContactPictureViewDiameter = 52;
 
     NSAttributedString *attributedDate = [self dateAttributedString:thread.lastMessageDate];
     NSUInteger unreadCount = [[TSMessagesManager sharedManager] unreadMessagesInThread:thread];
+    // Max out the per-thread unread count at 99.
+    unreadCount = MIN((NSUInteger)99, unreadCount);
 
     self.nameLabel.text = name;
     self.snippetLabel.attributedText = snippetText;