diff --git a/vector/src/main/java/im/vector/riotx/features/roomdirectory/RoomDirectoryViewModel.kt b/vector/src/main/java/im/vector/riotx/features/roomdirectory/RoomDirectoryViewModel.kt
index d89f0e2b99..dcd64c6a46 100644
--- a/vector/src/main/java/im/vector/riotx/features/roomdirectory/RoomDirectoryViewModel.kt
+++ b/vector/src/main/java/im/vector/riotx/features/roomdirectory/RoomDirectoryViewModel.kt
@@ -178,7 +178,9 @@ class RoomDirectoryViewModel @AssistedInject constructor(@Assisted initialState:
                             copy(
                                     asyncPublicRoomsRequest = Success(data.chunk!!),
                                     // It's ok to append at the end of the list, so I use publicRooms.size()
-                                    publicRooms = publicRooms.appendAt(data.chunk!!, publicRooms.size),
+                                    publicRooms = publicRooms.appendAt(data.chunk!!, publicRooms.size)
+                                            // Rageshake #8206 tells that we can have several times the same room
+                                            .distinctBy { it.roomId },
                                     hasMore = since != null
                             )
                         }