diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListViewModel.kt b/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListViewModel.kt
index cc1970dadc..81c75ed1d7 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListViewModel.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListViewModel.kt
@@ -101,17 +101,17 @@ class RoomListViewModel @Inject constructor(initialState: RoomListViewState,
                 .observeOn(Schedulers.computation())
                 .map { buildRoomSummaries(it) }
                 .execute { async ->
-                    val invitedRooms = async()?.get(RoomCategory.INVITE)?.map { it.roomId } ?: emptyList()
+                    val invitedRooms = async()?.get(RoomCategory.INVITE)?.map { it.roomId }.orEmpty()
                     val remainingJoining = joiningRoomsIds.intersect(invitedRooms)
+                    val remainingJoinErrors = joiningErrorRoomsIds.intersect(invitedRooms)
                     val remainingRejecting = rejectingRoomsIds.intersect(invitedRooms)
                     val remainingRejectErrors = rejectingErrorRoomsIds.intersect(invitedRooms)
-                    val remainingJoinErrors = joiningErrorRoomsIds.intersect(invitedRooms)
                     copy(
                             asyncFilteredRooms = async,
                             joiningRoomsIds = remainingJoining,
+                            joiningErrorRoomsIds = remainingJoinErrors,
                             rejectingRoomsIds = remainingRejecting,
-                            rejectingErrorRoomsIds = remainingRejectErrors,
-                            joiningErrorRoomsIds = remainingJoinErrors
+                            rejectingErrorRoomsIds = remainingRejectErrors
                     )
                 }
     }