diff --git a/features/roomlist/src/main/java/io/element/android/x/features/roomlist/model/RoomListRoomSummary.kt b/features/roomlist/src/main/java/io/element/android/x/features/roomlist/model/RoomListRoomSummary.kt
index 2f17cc0b25..4bac53544c 100644
--- a/features/roomlist/src/main/java/io/element/android/x/features/roomlist/model/RoomListRoomSummary.kt
+++ b/features/roomlist/src/main/java/io/element/android/x/features/roomlist/model/RoomListRoomSummary.kt
@@ -16,11 +16,11 @@
 
 package io.element.android.x.features.roomlist.model
 
-import androidx.compose.runtime.Stable
+import androidx.compose.runtime.Immutable
 import io.element.android.x.designsystem.components.avatar.AvatarData
 import io.element.android.x.matrix.core.RoomId
 
-@Stable
+@Immutable
 data class RoomListRoomSummary(
     val id: String,
     val roomId: RoomId = RoomId(id),
diff --git a/features/roomlist/src/main/java/io/element/android/x/features/roomlist/model/RoomListState.kt b/features/roomlist/src/main/java/io/element/android/x/features/roomlist/model/RoomListState.kt
index 97ce9b4023..e6480a1677 100644
--- a/features/roomlist/src/main/java/io/element/android/x/features/roomlist/model/RoomListState.kt
+++ b/features/roomlist/src/main/java/io/element/android/x/features/roomlist/model/RoomListState.kt
@@ -1,10 +1,10 @@
 package io.element.android.x.features.roomlist.model
 
-import androidx.compose.runtime.Stable
+import androidx.compose.runtime.Immutable
 import io.element.android.x.matrix.ui.model.MatrixUser
 import kotlinx.collections.immutable.ImmutableList
 
-@Stable
+@Immutable
 data class RoomListState(
     val matrixUser: MatrixUser?,
     val roomList: ImmutableList<RoomListRoomSummary>,
diff --git a/features/roomlist/src/main/java/io/element/android/x/features/roomlist/model/RoomListViewState.kt b/features/roomlist/src/main/java/io/element/android/x/features/roomlist/model/RoomListViewState.kt
deleted file mode 100644
index 4fb02b054c..0000000000
--- a/features/roomlist/src/main/java/io/element/android/x/features/roomlist/model/RoomListViewState.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2022 New Vector Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.element.android.x.features.roomlist.model
-
-import com.airbnb.mvrx.Async
-import com.airbnb.mvrx.MavericksState
-import com.airbnb.mvrx.Uninitialized
-import io.element.android.x.matrix.core.RoomId
-
-data class RoomListViewState(
-    // Will contain the filtered rooms, using ::filter (if filter is not empty)
-    val rooms: Async<List<RoomListRoomSummary>> = Uninitialized,
-    val filter: String = "",
-    val canLoadMore: Boolean = false,
-    val roomsById: Map<RoomId, RoomListRoomSummary> = emptyMap()
-) : MavericksState
diff --git a/libraries/designsystem/src/main/java/io/element/android/x/designsystem/components/avatar/AvatarData.kt b/libraries/designsystem/src/main/java/io/element/android/x/designsystem/components/avatar/AvatarData.kt
index 346aeca336..d4fb492901 100644
--- a/libraries/designsystem/src/main/java/io/element/android/x/designsystem/components/avatar/AvatarData.kt
+++ b/libraries/designsystem/src/main/java/io/element/android/x/designsystem/components/avatar/AvatarData.kt
@@ -16,9 +16,9 @@
 
 package io.element.android.x.designsystem.components.avatar
 
-import androidx.compose.runtime.Stable
+import androidx.compose.runtime.Immutable
 
-@Stable
+@Immutable
 data class AvatarData(
     val name: String = "",
     val model: ByteArray? = null,
diff --git a/libraries/matrixui/src/main/java/io/element/android/x/matrix/ui/model/MatrixUser.kt b/libraries/matrixui/src/main/java/io/element/android/x/matrix/ui/model/MatrixUser.kt
index 5aaa69e6e6..3dfebaf16b 100644
--- a/libraries/matrixui/src/main/java/io/element/android/x/matrix/ui/model/MatrixUser.kt
+++ b/libraries/matrixui/src/main/java/io/element/android/x/matrix/ui/model/MatrixUser.kt
@@ -16,11 +16,12 @@
 
 package io.element.android.x.matrix.ui.model
 
+import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.Stable
 import io.element.android.x.designsystem.components.avatar.AvatarData
 import io.element.android.x.matrix.core.UserId
 
-@Stable
+@Immutable
 data class MatrixUser(
     val id: UserId,
     val username: String? = null,