diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt
index 71c1d8303e..5a265c2b26 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt
@@ -62,6 +62,7 @@ data class RoomSummary(
         val roomType: String? = null,
         val spaceParents: List<SpaceParentInfo>? = null,
         val spaceChildren: List<SpaceChildInfo>? = null,
+        val flattenParents: List<SpaceParentInfo> = emptyList(),
         val flattenParentIds: List<String> = emptyList(),
         val roomEncryptionAlgorithm: RoomEncryptionAlgorithm? = null
 ) {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
index b165fb3001..752c828710 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
@@ -194,19 +194,7 @@ internal class RoomSummaryDataSource @Inject constructor(
         }
         val dataSourceFactory = realmDataSourceFactory.map {
             roomSummaryMapper.map(it)
-        }.map { roomSummary ->
-            val parents = roomSummary.flattenParentIds.mapNotNull { parentId ->
-                getRoomSummary(parentId)?.let { parentSummary ->
-                    SpaceParentInfo(
-                            parentId = parentSummary.flattenParentIds.firstOrNull(),
-                            roomSummary = parentSummary,
-                            canonical = true,
-                            viaServers = emptyList()
-                    )
-                }
-            }
-            roomSummary.copy(spaceParents = parents)
-        }
+        }.map { it.getWithParents()}
 
         val boundaries = MutableLiveData(ResultBoundaries())
 
@@ -245,6 +233,20 @@ internal class RoomSummaryDataSource @Inject constructor(
         }
     }
 
+    private fun RoomSummary.getWithParents(): RoomSummary {
+        val parents = flattenParentIds.mapNotNull { parentId ->
+            getRoomSummary(parentId)?.let { parentSummary ->
+                SpaceParentInfo(
+                        parentId = parentSummary.flattenParentIds.firstOrNull(),
+                        roomSummary = parentSummary,
+                        canonical = true,
+                        viaServers = emptyList()
+                )
+            }
+        }
+        return copy(flattenParents = parents)
+    }
+
     fun getCountLive(queryParams: RoomSummaryQueryParams): LiveData<Int> {
         val liveRooms = monarchy.findAllManagedWithChanges {
             roomSummariesQuery(it, queryParams)