diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
index fb6a54e3a8..c68f4db146 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/space/DefaultSpaceService.kt
@@ -141,9 +141,9 @@ internal class DefaultSpaceService @Inject constructor(
                                                         name = childSummary.name,
                                                         topic = childSummary.topic,
                                                         avatarUrl = childSummary.avatarUrl,
-                                                        order = childStateEvContent?.order,
-                                                        autoJoin = childStateEvContent?.autoJoin ?: false,
-                                                        viaServers = childStateEvContent?.via ?: emptyList(),
+                                                        order = childStateEvContent.order,
+                                                        autoJoin = childStateEvContent.autoJoin ?: false,
+                                                        viaServers = childStateEvContent.via.orEmpty(),
                                                         activeMemberCount = childSummary.numJoinedMembers,
                                                         parentRoomId = childStateEv.roomId
                                                 )