diff --git a/core-models/src/main/java/com/anytypeio/anytype/core_models/ObjectWrapper.kt b/core-models/src/main/java/com/anytypeio/anytype/core_models/ObjectWrapper.kt
index 8ade4813ab..110ce51228 100644
--- a/core-models/src/main/java/com/anytypeio/anytype/core_models/ObjectWrapper.kt
+++ b/core-models/src/main/java/com/anytypeio/anytype/core_models/ObjectWrapper.kt
@@ -298,14 +298,14 @@ sealed class ObjectWrapper {
 
         val isLoading: Boolean
             get() {
-                return spaceLocalStatus == SpaceStatus.LOADING
+                return spaceLocalStatus == SpaceStatus.LOADING || spaceLocalStatus == SpaceStatus.UNKNOWN
                         && spaceAccountStatus != SpaceStatus.SPACE_REMOVING
                         && spaceAccountStatus != SpaceStatus.SPACE_DELETED
             }
 
         val isActive: Boolean
             get() {
-                return spaceLocalStatus == SpaceStatus.OK
+                return spaceAccountStatus == SpaceStatus.SPACE_ACTIVE
                         && spaceAccountStatus != SpaceStatus.SPACE_REMOVING
                         && spaceAccountStatus != SpaceStatus.SPACE_DELETED
             }
diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/vault/VaultViewModel.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/vault/VaultViewModel.kt
index e39ac133c6..4ee8b7cc9c 100644
--- a/presentation/src/main/java/com/anytypeio/anytype/presentation/vault/VaultViewModel.kt
+++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/vault/VaultViewModel.kt
@@ -84,7 +84,7 @@ class VaultViewModel(
                 }
                 .combine(observeVaultSettings.flow()) { spaces, settings ->
                     spaces
-                        .filter { space -> space.isActive || space.isLoading }
+                        .filter { space -> space.isActive }
                         .distinctBy { it.id }
                         .map { space ->
                             VaultSpaceView(