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 0d0be17cc6..9274b78646 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
@@ -633,7 +633,12 @@ class VaultRepositoryImpl(
                         ),
                     )
             }
-            .onSuccess { vaultDiskSource.saveCipher(userId = userId, cipher = it) }
+            .onSuccess {
+                vaultDiskSource.saveCipher(
+                    userId = userId,
+                    cipher = it.copy(collectionIds = collectionIds),
+                )
+            }
             .fold(
                 onFailure = { CreateCipherResult.Error },
                 onSuccess = { CreateCipherResult.Success },
@@ -797,7 +802,12 @@ class VaultRepositoryImpl(
                     ),
                 )
             }
-            .onSuccess { vaultDiskSource.saveCipher(userId = userId, cipher = it) }
+            .onSuccess {
+                vaultDiskSource.saveCipher(
+                    userId = userId,
+                    cipher = it.copy(collectionIds = collectionIds),
+                )
+            }
             .fold(
                 onFailure = { ShareCipherResult.Error },
                 onSuccess = { ShareCipherResult.Success },
diff --git a/app/src/test/java/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryTest.kt
index dbc7fb130e..c651fe5146 100644
--- a/app/src/test/java/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryTest.kt
+++ b/app/src/test/java/com/x8bit/bitwarden/data/vault/repository/VaultRepositoryTest.kt
@@ -1874,7 +1874,12 @@ class VaultRepositoryTest {
                     ),
                 )
             } returns mockCipher.asSuccess()
-            coEvery { vaultDiskSource.saveCipher(userId, mockCipher) } just runs
+            coEvery {
+                vaultDiskSource.saveCipher(
+                    userId,
+                    mockCipher.copy(collectionIds = listOf("mockId-1")),
+                )
+            } just runs
 
             val result = vaultRepository.createCipherInOrganization(
                 cipherView = mockCipherView,
@@ -2842,7 +2847,13 @@ class VaultRepositoryTest {
                     ),
                 )
             } returns createMockCipher(number = 1).asSuccess()
-            coEvery { vaultDiskSource.saveCipher(userId, createMockCipher(number = 1)) } just runs
+            coEvery {
+                vaultDiskSource.saveCipher(
+                    userId,
+                    createMockCipher(number = 1)
+                        .copy(collectionIds = listOf("mockId-1")),
+                )
+            } just runs
 
             val result = vaultRepository.shareCipher(
                 cipherId = "mockId-1",