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 b6ad695aa8..360cb9756e 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
@@ -34,6 +34,7 @@ import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.text.toDp
 import io.element.android.libraries.designsystem.theme.components.Text
+import kotlinx.collections.immutable.persistentListOf
 
 @Composable
 fun EmojiItem(
@@ -86,7 +87,7 @@ internal fun EmojiItemPreview() = ElementPreview {
                     hexcode = "",
                     label = "",
                     tags = null,
-                    shortcodes = emptyList(),
+                    shortcodes = persistentListOf(),
                     unicode = "👍",
                     skins = null
                 ),
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/MessagesViewTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/MessagesViewTest.kt
index f8a5436ffe..c716b986b6 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/MessagesViewTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/MessagesViewTest.kt
@@ -73,6 +73,7 @@ import io.element.android.tests.testutils.ensureCalledOnce
 import io.element.android.tests.testutils.pressBack
 import io.element.android.tests.testutils.setSafeContent
 import kotlinx.collections.immutable.persistentListOf
+import kotlinx.collections.immutable.persistentMapOf
 import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.TestRule
@@ -518,13 +519,13 @@ class MessagesViewTest {
                 target = CustomReactionState.Target.Success(
                     event = timelineItem,
                     emojibaseStore = EmojibaseStore(
-                        categories = mapOf(
-                            EmojibaseCategory.People to listOf(
+                        categories = persistentMapOf(
+                            EmojibaseCategory.People to persistentListOf(
                                 Emoji(
                                     hexcode = "",
                                     label = "",
-                                    tags = emptyList(),
-                                    shortcodes = emptyList(),
+                                    tags = persistentListOf(),
+                                    shortcodes = persistentListOf(),
                                     unicode = aUnicode,
                                     skins = null,
                                 )
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/FakeEmojibaseProvider.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/FakeEmojibaseProvider.kt
index 3cba1b6cf3..498027bae6 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/FakeEmojibaseProvider.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/FakeEmojibaseProvider.kt
@@ -8,8 +8,9 @@
 package io.element.android.features.messages.impl.timeline.components.customreaction
 
 import io.element.android.emojibasebindings.EmojibaseStore
+import kotlinx.collections.immutable.persistentMapOf
 
 class FakeEmojibaseProvider : EmojibaseProvider {
     override val emojibaseStore: EmojibaseStore
-        get() = EmojibaseStore(mapOf())
+        get() = EmojibaseStore(persistentMapOf())
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 137edac40b..59a8307461 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -204,7 +204,7 @@ sentry = "io.sentry:sentry-android:8.20.0"
 matrix_analytics_events = "com.github.matrix-org:matrix-analytics-events:0.28.0"
 
 # Emojibase
-matrix_emojibase_bindings = "io.element.android:emojibase-bindings:1.4.2"
+matrix_emojibase_bindings = "io.element.android:emojibase-bindings:1.4.3"
 sigpwned_emoji4j = "com.sigpwned:emoji4j-core:16.0.0"
 
 # Di