diff --git a/stream-chat-android-ui-uitests/src/androidTest/java/io/getstream/chat/android/uitests/snapshot/compose/channels/ChannelItemTest.kt b/stream-chat-android-ui-uitests/src/androidTest/java/io/getstream/chat/android/uitests/snapshot/compose/channels/ChannelItemTest.kt
index ce4e3264c46..f1f392fc7b9 100644
--- a/stream-chat-android-ui-uitests/src/androidTest/java/io/getstream/chat/android/uitests/snapshot/compose/channels/ChannelItemTest.kt
+++ b/stream-chat-android-ui-uitests/src/androidTest/java/io/getstream/chat/android/uitests/snapshot/compose/channels/ChannelItemTest.kt
@@ -16,7 +16,7 @@
 
 package io.getstream.chat.android.uitests.snapshot.compose.channels
 
-import io.getstream.chat.android.compose.state.channels.list.ChannelItemState
+import io.getstream.chat.android.compose.state.channels.list.ItemState.ChannelItemState
 import io.getstream.chat.android.compose.ui.channels.list.ChannelItem
 import io.getstream.chat.android.uitests.snapshot.compose.ComposeScreenshotTest
 import io.getstream.chat.android.uitests.util.TestData
diff --git a/stream-chat-android-ui-uitests/src/androidTest/java/io/getstream/chat/android/uitests/snapshot/compose/channels/ChannelListTest.kt b/stream-chat-android-ui-uitests/src/androidTest/java/io/getstream/chat/android/uitests/snapshot/compose/channels/ChannelListTest.kt
index 11e4f7c23e5..4406d5f256e 100644
--- a/stream-chat-android-ui-uitests/src/androidTest/java/io/getstream/chat/android/uitests/snapshot/compose/channels/ChannelListTest.kt
+++ b/stream-chat-android-ui-uitests/src/androidTest/java/io/getstream/chat/android/uitests/snapshot/compose/channels/ChannelListTest.kt
@@ -18,8 +18,8 @@ package io.getstream.chat.android.uitests.snapshot.compose.channels
 
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.ui.Modifier
-import io.getstream.chat.android.compose.state.channels.list.ChannelItemState
 import io.getstream.chat.android.compose.state.channels.list.ChannelsState
+import io.getstream.chat.android.compose.state.channels.list.ItemState.ChannelItemState
 import io.getstream.chat.android.compose.ui.channels.list.ChannelList
 import io.getstream.chat.android.uitests.snapshot.compose.ComposeScreenshotTest
 import io.getstream.chat.android.uitests.util.TestData
diff --git a/stream-chat-android-ui-uitests/src/androidTest/java/io/getstream/chat/android/uitests/snapshot/compose/messages/MessageContainerTest.kt b/stream-chat-android-ui-uitests/src/androidTest/java/io/getstream/chat/android/uitests/snapshot/compose/messages/MessageContainerTest.kt
index 05c01f97136..28fcd803ef2 100644
--- a/stream-chat-android-ui-uitests/src/androidTest/java/io/getstream/chat/android/uitests/snapshot/compose/messages/MessageContainerTest.kt
+++ b/stream-chat-android-ui-uitests/src/androidTest/java/io/getstream/chat/android/uitests/snapshot/compose/messages/MessageContainerTest.kt
@@ -18,6 +18,7 @@ package io.getstream.chat.android.uitests.snapshot.compose.messages
 
 import io.getstream.chat.android.compose.ui.messages.list.MessageContainer
 import io.getstream.chat.android.models.Message
+import io.getstream.chat.android.models.ReactionSortingByCount
 import io.getstream.chat.android.ui.common.state.messages.list.DateSeparatorItemState
 import io.getstream.chat.android.ui.common.state.messages.list.SystemMessageItemState
 import io.getstream.chat.android.ui.common.state.messages.list.ThreadDateSeparatorItemState
@@ -30,16 +31,25 @@ class MessageContainerTest : ComposeScreenshotTest() {
 
     @Test
     fun dateSeparator() = runScreenshotTest {
-        MessageContainer(DateSeparatorItemState(TestData.date1()))
+        MessageContainer(
+            DateSeparatorItemState(TestData.date1()),
+            reactionSorting = ReactionSortingByCount,
+        )
     }
 
     @Test
     fun threadSeparator() = runScreenshotTest {
-        MessageContainer(ThreadDateSeparatorItemState(date = Date(), replyCount = 5))
+        MessageContainer(
+            ThreadDateSeparatorItemState(date = Date(), replyCount = 5),
+            reactionSorting = ReactionSortingByCount,
+        )
     }
 
     @Test
     fun systemMessage() = runScreenshotTest {
-        MessageContainer(SystemMessageItemState(Message(text = "System message")))
+        MessageContainer(
+            SystemMessageItemState(Message(text = "System message")),
+            reactionSorting = ReactionSortingByCount,
+        )
     }
 }
diff --git a/stream-chat-android-ui-uitests/src/androidTest/java/io/getstream/chat/android/uitests/snapshot/compose/messages/MessageItemTest.kt b/stream-chat-android-ui-uitests/src/androidTest/java/io/getstream/chat/android/uitests/snapshot/compose/messages/MessageItemTest.kt
index 9f648e88a52..027b0ada910 100644
--- a/stream-chat-android-ui-uitests/src/androidTest/java/io/getstream/chat/android/uitests/snapshot/compose/messages/MessageItemTest.kt
+++ b/stream-chat-android-ui-uitests/src/androidTest/java/io/getstream/chat/android/uitests/snapshot/compose/messages/MessageItemTest.kt
@@ -17,6 +17,7 @@
 package io.getstream.chat.android.uitests.snapshot.compose.messages
 
 import io.getstream.chat.android.compose.ui.messages.list.MessageItem
+import io.getstream.chat.android.models.ReactionSortingByCount
 import io.getstream.chat.android.ui.common.state.messages.list.MessageItemState
 import io.getstream.chat.android.uitests.snapshot.compose.ComposeScreenshotTest
 import io.getstream.chat.android.uitests.util.TestData
@@ -33,6 +34,7 @@ class MessageItemTest : ComposeScreenshotTest() {
                 showMessageFooter = true,
             ),
             onLongItemClick = {},
+            reactionSorting = ReactionSortingByCount,
         )
     }
 
@@ -45,6 +47,7 @@ class MessageItemTest : ComposeScreenshotTest() {
                 showMessageFooter = true,
             ),
             onLongItemClick = {},
+            reactionSorting = ReactionSortingByCount,
         )
     }
 
@@ -58,6 +61,7 @@ class MessageItemTest : ComposeScreenshotTest() {
                 showMessageFooter = true,
             ),
             onLongItemClick = {},
+            reactionSorting = ReactionSortingByCount,
         )
     }
 }
diff --git a/stream-chat-android-ui-uitests/src/androidTest/java/io/getstream/chat/android/uitests/snapshot/compose/messages/MessageListTest.kt b/stream-chat-android-ui-uitests/src/androidTest/java/io/getstream/chat/android/uitests/snapshot/compose/messages/MessageListTest.kt
index c53c19492c9..1fd5e5a9094 100644
--- a/stream-chat-android-ui-uitests/src/androidTest/java/io/getstream/chat/android/uitests/snapshot/compose/messages/MessageListTest.kt
+++ b/stream-chat-android-ui-uitests/src/androidTest/java/io/getstream/chat/android/uitests/snapshot/compose/messages/MessageListTest.kt
@@ -17,6 +17,7 @@
 package io.getstream.chat.android.uitests.snapshot.compose.messages
 
 import io.getstream.chat.android.compose.ui.messages.list.MessageList
+import io.getstream.chat.android.models.ReactionSortingByCount
 import io.getstream.chat.android.ui.common.state.messages.list.MessageItemState
 import io.getstream.chat.android.ui.common.state.messages.list.MessageListState
 import io.getstream.chat.android.uitests.snapshot.compose.ComposeScreenshotTest
@@ -50,6 +51,7 @@ class MessageListTest : ComposeScreenshotTest() {
                 ),
                 currentUser = TestData.user1(),
             ),
+            reactionSorting = ReactionSortingByCount,
         )
     }
 
@@ -81,6 +83,7 @@ class MessageListTest : ComposeScreenshotTest() {
                 ),
                 currentUser = TestData.user1(),
             ),
+            reactionSorting = ReactionSortingByCount,
         )
     }
 }