diff --git a/packages/rocketchat-ui/client/lib/readMessages.js b/packages/rocketchat-ui/client/lib/readMessages.js
index 8fb246850e93..e03ee4afbc63 100644
--- a/packages/rocketchat-ui/client/lib/readMessages.js
+++ b/packages/rocketchat-ui/client/lib/readMessages.js
@@ -180,6 +180,7 @@ const readMessage = new class {
 
 			if (firstUnreadRecord != null) {
 				room.unreadFirstId = firstUnreadRecord._id;
+				$(room.dom).find(`.message.first-unread:not(#${ firstUnreadRecord._id })`).removeClass('first-unread');
 				$(room.dom).find(`.message#${ firstUnreadRecord._id }`).addClass('first-unread');
 			}
 		}