diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryImpl.kt
index ec9aebaf70..3d6a260dbf 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryImpl.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryImpl.kt
@@ -994,9 +994,7 @@ class VaultRepositoryImpl(
     ): Flow<DataState<List<CipherView>>> =
         vaultDiskSource
             .getCiphers(userId = userId)
-            .onStart {
-                mutableCiphersStateFlow.value = DataState.Loading
-            }
+            .onStart { mutableCiphersStateFlow.updateToPendingOrLoading() }
             .map {
                 waitUntilUnlocked(userId = userId)
                 vaultSdkSource
@@ -1017,7 +1015,7 @@ class VaultRepositoryImpl(
     ): Flow<DataState<DomainsData>> =
         vaultDiskSource
             .getDomains(userId = userId)
-            .onStart { mutableDomainsStateFlow.value = DataState.Loading }
+            .onStart { mutableDomainsStateFlow.updateToPendingOrLoading() }
             .map {
                 DataState.Loaded(
                     data = it.toDomainsData(),
@@ -1030,7 +1028,7 @@ class VaultRepositoryImpl(
     ): Flow<DataState<List<FolderView>>> =
         vaultDiskSource
             .getFolders(userId = userId)
-            .onStart { mutableFoldersStateFlow.value = DataState.Loading }
+            .onStart { mutableFoldersStateFlow.updateToPendingOrLoading() }
             .map {
                 waitUntilUnlocked(userId = userId)
                 vaultSdkSource
@@ -1051,7 +1049,7 @@ class VaultRepositoryImpl(
     ): Flow<DataState<List<CollectionView>>> =
         vaultDiskSource
             .getCollections(userId = userId)
-            .onStart { mutableCollectionsStateFlow.value = DataState.Loading }
+            .onStart { mutableCollectionsStateFlow.updateToPendingOrLoading() }
             .map {
                 waitUntilUnlocked(userId = userId)
                 vaultSdkSource
@@ -1076,7 +1074,7 @@ class VaultRepositoryImpl(
     ): Flow<DataState<SendData>> =
         vaultDiskSource
             .getSends(userId = userId)
-            .onStart { mutableSendDataStateFlow.value = DataState.Loading }
+            .onStart { mutableSendDataStateFlow.updateToPendingOrLoading() }
             .map {
                 waitUntilUnlocked(userId = userId)
                 vaultSdkSource