diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/membership/RoomMembers.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/membership/RoomMembers.kt
index b50424b343..9fba1d8f02 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/membership/RoomMembers.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/membership/RoomMembers.kt
@@ -73,6 +73,7 @@ internal class RoomMembers(private val realm: Realm,
         return EventEntity
                 .where(realm, roomId, EventType.STATE_ROOM_MEMBER)
                 .sort(EventEntityFields.STATE_INDEX, Sort.DESCENDING)
+                .isNotNull(EventEntityFields.STATE_KEY)
                 .distinct(EventEntityFields.STATE_KEY)
                 .isNotNull(EventEntityFields.CONTENT)
     }
diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/composer/TextComposerViewModel.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/composer/TextComposerViewModel.kt
index 84917d682b..69ecc30583 100644
--- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/composer/TextComposerViewModel.kt
+++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/composer/TextComposerViewModel.kt
@@ -76,11 +76,8 @@ class TextComposerViewModel @AssistedInject constructor(@Assisted initialState:
         Observable.combineLatest<List<String>, Option<AutocompleteUserQuery>, List<User>>(
                 room.rx().liveRoomMemberIds(),
                 usersQueryObservable.throttleLast(300, TimeUnit.MILLISECONDS),
-                BiFunction { roomMembers, query ->
-                    val users = roomMembers
-                            .mapNotNull {
-                                session.getUser(it)
-                            }
+                BiFunction { roomMemberIds, query ->
+                    val users = roomMemberIds.mapNotNull { session.getUser(it) }
 
                     val filter = query.orNull()
                     if (filter.isNullOrBlank()) {