diff --git a/crates/bitwarden/src/vault/cipher/cipher.rs b/crates/bitwarden/src/vault/cipher/cipher.rs
index b01f17136..b95a2f090 100644
--- a/crates/bitwarden/src/vault/cipher/cipher.rs
+++ b/crates/bitwarden/src/vault/cipher/cipher.rs
@@ -43,6 +43,9 @@ pub struct Cipher {
     pub folder_id: Option<Uuid>,
     pub collection_ids: Vec<Uuid>,
 
+    /// More recent ciphers uses individual encryption keys to encrypt the other fields of the Cipher.
+    pub key: Option<EncString>,
+
     pub name: EncString,
     pub notes: Option<EncString>,
 
@@ -77,6 +80,8 @@ pub struct CipherView {
     pub folder_id: Option<Uuid>,
     pub collection_ids: Vec<Uuid>,
 
+    pub key: Option<EncString>,
+
     pub name: String,
     pub notes: Option<String>,
 
@@ -131,11 +136,15 @@ pub struct CipherListView {
 
 impl KeyEncryptable<Cipher> for CipherView {
     fn encrypt_with_key(self, key: &SymmetricCryptoKey) -> Result<Cipher> {
+        let ciphers_key = Cipher::get_cipher_key(key, &self.key)?;
+        let key = ciphers_key.as_ref().unwrap_or(key);
+
         Ok(Cipher {
             id: self.id,
             organization_id: self.organization_id,
             folder_id: self.folder_id,
             collection_ids: self.collection_ids,
+            key: self.key,
             name: self.name.encrypt_with_key(key)?,
             notes: self.notes.encrypt_with_key(key)?,
             r#type: self.r#type,
@@ -161,11 +170,15 @@ impl KeyEncryptable<Cipher> for CipherView {
 
 impl KeyDecryptable<CipherView> for Cipher {
     fn decrypt_with_key(&self, key: &SymmetricCryptoKey) -> Result<CipherView> {
+        let ciphers_key = Cipher::get_cipher_key(key, &self.key)?;
+        let key = ciphers_key.as_ref().unwrap_or(key);
+
         Ok(CipherView {
             id: self.id,
             organization_id: self.organization_id,
             folder_id: self.folder_id,
             collection_ids: self.collection_ids.clone(),
+            key: self.key.clone(),
             name: self.name.decrypt_with_key(key)?,
             notes: self.notes.decrypt_with_key(key)?,
             r#type: self.r#type,
@@ -190,6 +203,23 @@ impl KeyDecryptable<CipherView> for Cipher {
 }
 
 impl Cipher {
+    /// Get the decrypted individual encryption key for this cipher.
+    /// Note that some ciphers do not have individual encryption keys,
+    /// in which case this will return Ok(None) and the key associated
+    /// with this cipher's user or organization must be used instead
+    fn get_cipher_key(
+        key: &SymmetricCryptoKey,
+        ciphers_key: &Option<EncString>,
+    ) -> Result<Option<SymmetricCryptoKey>> {
+        ciphers_key
+            .as_ref()
+            .map(|k| {
+                let key: Vec<u8> = k.decrypt_with_key(key)?;
+                SymmetricCryptoKey::try_from(key.as_slice())
+            })
+            .transpose()
+    }
+
     fn get_decrypted_subtitle(&self, key: &SymmetricCryptoKey) -> Result<String> {
         Ok(match self.r#type {
             CipherType::Login => {
@@ -257,6 +287,9 @@ impl Cipher {
 
 impl KeyDecryptable<CipherListView> for Cipher {
     fn decrypt_with_key(&self, key: &SymmetricCryptoKey) -> Result<CipherListView> {
+        let ciphers_key = Cipher::get_cipher_key(key, &self.key)?;
+        let key = ciphers_key.as_ref().unwrap_or(key);
+
         Ok(CipherListView {
             id: self.id,
             organization_id: self.organization_id,