diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/ColorAliases.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/ColorAliases.kt
index 5fd5c3f0af..8dcf4a9dfe 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/ColorAliases.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/ColorAliases.kt
@@ -25,6 +25,7 @@ import io.element.android.libraries.designsystem.SystemGrey6Light
 import io.element.android.libraries.designsystem.preview.ElementPreviewDark
 import io.element.android.libraries.designsystem.preview.ElementPreviewLight
 import io.element.android.libraries.designsystem.theme.previews.ColorListPreview
+import kotlinx.collections.immutable.persistentMapOf
 
 /**
  * Room list.
@@ -57,7 +58,7 @@ private fun ContentToPreview() {
     ColorListPreview(
         backgroundColor = Color.Black,
         foregroundColor = Color.White,
-        colors = mapOf(
+        colors = persistentMapOf(
             "roomListRoomName" to MaterialTheme.roomListRoomName(),
             "roomListRoomMessage" to MaterialTheme.roomListRoomMessage(),
             "roomListRoomMessageDate" to MaterialTheme.roomListRoomMessageDate(),
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/previews/ColorListPreview.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/previews/ColorListPreview.kt
index 3d728c0ad4..f511d619d0 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/previews/ColorListPreview.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/previews/ColorListPreview.kt
@@ -25,12 +25,13 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
+import kotlinx.collections.immutable.ImmutableMap
 
 @Composable
 internal fun ColorListPreview(
     backgroundColor: Color,
     foregroundColor: Color,
-    colors: Map<String, Color>,
+    colors: ImmutableMap<String, Color>,
     modifier: Modifier = Modifier,
 ) {
     Column(
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/previews/ColorsSchemePreview.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/previews/ColorsSchemePreview.kt
index 79bdb0b35f..6a764e9907 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/previews/ColorsSchemePreview.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/previews/ColorsSchemePreview.kt
@@ -20,6 +20,7 @@ import androidx.compose.material3.ColorScheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import kotlinx.collections.immutable.persistentMapOf
 
 @Composable
 internal fun ColorsSchemePreview(
@@ -28,7 +29,7 @@ internal fun ColorsSchemePreview(
     colorScheme: ColorScheme,
     modifier: Modifier = Modifier,
 ) {
-    val colors = mapOf(
+    val colors = persistentMapOf(
         "primary" to colorScheme.primary,
         "onPrimary" to colorScheme.onPrimary,
         "primaryContainer" to colorScheme.primaryContainer,