diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingContent.kt b/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingContent.kt
index 3148a18324..c1ef1dd250 100644
--- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingContent.kt
+++ b/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingContent.kt
@@ -160,7 +160,7 @@ fun VaultItemListingContent(
 
             itemsIndexed(
                 items = state.displayCollectionList,
-                key = { _, collection -> collection.id },
+                key = { _, collection -> "collection_${collection.id}" },
             ) { index, collection ->
                 BitwardenGroupItem(
                     startIcon = IconData.Local(iconRes = BitwardenDrawable.ic_collections),
@@ -195,7 +195,7 @@ fun VaultItemListingContent(
 
             itemsIndexed(
                 items = state.displayFolderList,
-                key = { _, folder -> folder.id },
+                key = { _, folder -> "folder_${folder.id}" },
             ) { index, folder ->
                 BitwardenGroupItem(
                     startIcon = IconData.Local(iconRes = BitwardenDrawable.ic_folder),
@@ -229,7 +229,7 @@ fun VaultItemListingContent(
             }
             itemsIndexed(
                 items = state.displayItemList,
-                key = { _, item -> item.id },
+                key = { _, item -> "item_${item.id}" },
             ) { index, it ->
                 BitwardenListItem(
                     startIcon = it.iconData,
diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/VaultContent.kt b/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/VaultContent.kt
index 9346fac4b4..e5f4e49710 100644
--- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/VaultContent.kt
+++ b/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/vault/VaultContent.kt
@@ -142,7 +142,7 @@ fun VaultContent(
 
             itemsIndexed(
                 items = state.favoriteItems,
-                key = { _, favorite -> favorite.id },
+                key = { _, favorite -> "favorite_${favorite.id}" },
             ) { index, favoriteItem ->
                 VaultEntryListItem(
                     startIcon = favoriteItem.startIcon,
@@ -307,7 +307,7 @@ fun VaultContent(
 
             itemsIndexed(
                 items = state.folderItems,
-                key = { _, folder -> folder.id ?: "no_folder_group" },
+                key = { _, folder -> "folder_${folder.id}" },
             ) { index, folder ->
                 BitwardenGroupItem(
                     startIcon = IconData.Local(iconRes = BitwardenDrawable.ic_folder),
@@ -344,7 +344,7 @@ fun VaultContent(
             }
             itemsIndexed(
                 items = state.noFolderItems,
-                key = { _, noFolderItem -> noFolderItem.id },
+                key = { _, noFolderItem -> "no_folder_${noFolderItem.id}" },
             ) { index, noFolderItem ->
                 VaultEntryListItem(
                     startIcon = noFolderItem.startIcon,
@@ -400,7 +400,7 @@ fun VaultContent(
 
             itemsIndexed(
                 items = state.collectionItems,
-                key = { _, collection -> collection.id },
+                key = { _, collection -> "collection_${collection.id}" },
             ) { index, collection ->
                 BitwardenGroupItem(
                     startIcon = IconData.Local(iconRes = BitwardenDrawable.ic_collections),