diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemViewModel.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemViewModel.kt
index e6a3fb62dd..7d6fbbabcd 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemViewModel.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemViewModel.kt
@@ -157,12 +157,11 @@ class VaultItemViewModel @Inject constructor(
                                 folderState.data?.firstOrNull { folder -> folderId == folder.id }
                             }
                             ?.name
-                        val relatedLocations = buildList {
-                            organizationName?.let { add(VaultItemLocation.Organization(it)) }
-                            addAll(collections.map { VaultItemLocation.Collection(it) })
-                            folderName?.let { add(VaultItemLocation.Folder(it)) }
-                        }
-                            .toImmutableList()
+                        val relatedLocations = persistentListOfNotNull(
+                            organizationName?.let { VaultItemLocation.Organization(it) },
+                            *collections.map { VaultItemLocation.Collection(it) }.toTypedArray(),
+                            folderName?.let { VaultItemLocation.Folder(it) },
+                        )
 
                         VaultItemStateData(
                             cipher = cipherView,