diff --git a/changelog.d/6200.bugfix b/changelog.d/6200.bugfix
index 41b0088a03..ee204b4567 100644
--- a/changelog.d/6200.bugfix
+++ b/changelog.d/6200.bugfix
@@ -1,2 +1 @@
 Fixes room not being in space after upgrade
-
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/VersioningState.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/VersioningState.kt
index b4e7b10d44..6d15d1a007 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/VersioningState.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/VersioningState.kt
@@ -19,5 +19,7 @@ package org.matrix.android.sdk.api.session.room.model
 enum class VersioningState {
     NONE,
     UPGRADED_ROOM_NOT_JOINED,
-    UPGRADED_ROOM_JOINED
+    UPGRADED_ROOM_JOINED;
+
+    fun isUpgraded() = this != NONE
 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryController.kt b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryController.kt
index 25e69959c7..5da5ae8510 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryController.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryController.kt
@@ -44,7 +44,6 @@ import org.matrix.android.sdk.api.failure.MatrixError.Companion.M_UNRECOGNIZED
 import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
 import org.matrix.android.sdk.api.session.room.model.RoomType
 import org.matrix.android.sdk.api.session.room.model.SpaceChildInfo
-import org.matrix.android.sdk.api.session.room.model.VersioningState
 import org.matrix.android.sdk.api.util.toMatrixItem
 import javax.inject.Inject
 
@@ -213,5 +212,5 @@ class SpaceDirectoryController @Inject constructor(
     }
 
     private fun SpaceChildInfo.isUpgradedRoom(data: SpaceDirectoryState) =
-            data.knownRoomSummaries.any { it.roomId == childRoomId && it.versioningState != VersioningState.NONE }
+            data.knownRoomSummaries.any { it.roomId == childRoomId && it.versioningState.isUpgraded() }
 }