diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/EmojiItem.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/EmojiItem.kt
index ee5055176c..7ea023fe40 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/EmojiItem.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/EmojiItem.kt
@@ -59,7 +59,9 @@ import io.element.android.features.messages.impl.timeline.components.customreact
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.theme.components.Text
+import kotlinx.collections.immutable.ImmutableSet
 import kotlinx.collections.immutable.persistentListOf
+import kotlinx.collections.immutable.persistentSetOf
 
 @Composable
 fun EmojiItem(
@@ -71,7 +73,7 @@ fun EmojiItem(
     onLongPress: ((Emoji) -> Unit)? = null,
     skinPickerEmoji: Emoji? = null,
     onDismissSkinPicker: (() -> Unit)? = null,
-    selectedSkinUnicodes: Set<String> = emptySet(),
+    selectedSkinUnicodes: ImmutableSet<String> = persistentSetOf(),
     hasSelectedSkin: Boolean = false,
 ) {
     val backgroundColor = when {
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/picker/SkinTonePicker.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/picker/SkinTonePicker.kt
index 7fdfbfb1a4..c49b07023f 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/picker/SkinTonePicker.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/picker/SkinTonePicker.kt
@@ -32,7 +32,9 @@ import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.text.toSp
 import io.element.android.libraries.designsystem.theme.components.Surface
 import io.element.android.libraries.designsystem.theme.components.Text
+import kotlinx.collections.immutable.ImmutableSet
 import kotlinx.collections.immutable.persistentListOf
+import kotlinx.collections.immutable.persistentSetOf
 
 val SkinToneSlotSize = 48.dp
 val SkinToneSlotSpacing = 2.dp
@@ -44,7 +46,7 @@ fun SkinTonePicker(
     onSelect: (Emoji) -> Unit,
     modifier: Modifier = Modifier,
     hoveredIndex: Int = -1,
-    selectedUnicodes: Set<String> = emptySet(),
+    selectedUnicodes: ImmutableSet<String> = persistentSetOf(),
 ) {
     val skins = emoji.skins.orEmpty()
     val emojiSize = 32.dp.toSp()