diff --git a/app/containers/message/index.tsx b/app/containers/message/index.tsx
index 39e236f98..21d74de45 100644
--- a/app/containers/message/index.tsx
+++ b/app/containers/message/index.tsx
@@ -93,7 +93,7 @@ class MessageContainer extends React.Component<IMessageContainerProps, IMessageC
 
 	shouldComponentUpdate(nextProps: IMessageContainerProps, nextState: IMessageContainerState) {
 		const { isManualUnignored } = this.state;
-		const { threadBadgeColor, isIgnored, highlighted } = this.props;
+		const { threadBadgeColor, isIgnored, highlighted, previousItem } = this.props;
 		if (nextProps.highlighted !== highlighted) {
 			return true;
 		}
@@ -106,6 +106,9 @@ class MessageContainer extends React.Component<IMessageContainerProps, IMessageC
 		if (nextState.isManualUnignored !== isManualUnignored) {
 			return true;
 		}
+		if (nextProps.previousItem?._id !== previousItem?._id) {
+			return true;
+		}
 		return false;
 	}