diff --git a/features/roomlist/src/main/java/io/element/android/x/features/roomlist/RoomListPresenter.kt b/features/roomlist/src/main/java/io/element/android/x/features/roomlist/RoomListPresenter.kt
index 3fad20ab7f..e4f52dce3f 100644
--- a/features/roomlist/src/main/java/io/element/android/x/features/roomlist/RoomListPresenter.kt
+++ b/features/roomlist/src/main/java/io/element/android/x/features/roomlist/RoomListPresenter.kt
@@ -71,7 +71,10 @@ class RoomListPresenter @Inject constructor(
     }
 
     private suspend fun updateFilteredRoomSummaries(roomSummaries: List<RoomSummary>?, filter: String): ImmutableList<RoomListRoomSummary> {
-        val mappedRoomSummaries = mapRoomSummaries(roomSummaries.orEmpty())
+        if (roomSummaries.isNullOrEmpty()) {
+            return RoomListRoomSummaryPlaceholders.createFakeList(16).toImmutableList()
+        }
+        val mappedRoomSummaries = mapRoomSummaries(roomSummaries)
         return if (filter.isEmpty()) {
             mappedRoomSummaries
         } else {