diff --git a/app/views/RoomsListView/index.tsx b/app/views/RoomsListView/index.tsx
index 90f22b749..84062f715 100644
--- a/app/views/RoomsListView/index.tsx
+++ b/app/views/RoomsListView/index.tsx
@@ -530,21 +530,6 @@ class RoomsListView extends React.Component<IRoomsListViewProps, IRoomsListViewS
 			let chats = data;
 
 			let omnichannelsUpdate: string[] = [];
-			let chatsUpdate = [];
-			if (showUnread) {
-				/**
-				 * If unread on top, we trigger re-render based on order changes and sub.alert
-				 * RoomItem handles its own re-render
-				 */
-				chatsUpdate = data.map(item => ({ rid: item.rid, alert: item.alert }));
-			} else {
-				/**
-				 * Otherwise, we trigger re-render only when chats order changes
-				 * RoomItem handles its own re-render
-				 */
-				chatsUpdate = data.map(item => item.rid);
-			}
-
 			const isOmnichannelAgent = user?.roles?.includes('livechat-agent');
 			if (isOmnichannelAgent) {
 				const omnichannel = chats.filter(s => filterIsOmnichannel(s));
@@ -586,6 +571,8 @@ class RoomsListView extends React.Component<IRoomsListViewProps, IRoomsListViewS
 				tempChats = chats;
 			}
 
+			const chatsUpdate = tempChats.map(item => item.rid);
+
 			this.internalSetState({
 				chats: tempChats,
 				chatsUpdate,