diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/picker/EmojiPickerState.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/picker/EmojiPickerState.kt
index 595349a503..04801a7ee6 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/picker/EmojiPickerState.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/picker/EmojiPickerState.kt
@@ -8,11 +8,14 @@
 package io.element.android.features.messages.impl.timeline.components.customreaction.picker
 
 import androidx.annotation.StringRes
+import androidx.compose.runtime.Immutable
 import io.element.android.emojibasebindings.Emoji
 import io.element.android.libraries.designsystem.theme.components.IconSource
 import io.element.android.libraries.designsystem.theme.components.SearchBarResultState
 import kotlinx.collections.immutable.ImmutableList
 
+// Emoji is unstable (because from an external library?), so we annotate with @Immutable
+@Immutable
 data class EmojiPickerState(
     val categories: ImmutableList<EmojiCategory>,
     val allEmojis: ImmutableList<Emoji>,