diff --git a/src/util/key_obfuscator.rs b/src/util/key_obfuscator.rs
index 21d1e14..8f420c3 100644
--- a/src/util/key_obfuscator.rs
+++ b/src/util/key_obfuscator.rs
@@ -136,6 +136,10 @@ impl KeyObfuscator {
 	fn generate_synthetic_nonce(&self, initial_nonce_material: &[u8]) -> [u8; NONCE_LENGTH] {
 		let hmac = Self::hkdf(&self.hashing_key, initial_nonce_material);
 		let mut nonce = [0u8; NONCE_LENGTH];
+		// TODO: While the RFC specifies a 12-byte nonce, we use an 8-byte nonce for
+		// backwards compatibility with the rust-lightning implementation of
+		// Chacha20Poly1305. We now use the rust-bitcoin implementation, which allows
+		// for 12-byte nonces, so we should figure out an upgrade path for this.
 		nonce[4..].copy_from_slice(&hmac[..8]);
 		nonce
 	}
diff --git a/src/util/storable_builder.rs b/src/util/storable_builder.rs
index c8c53ae..489991f 100644
--- a/src/util/storable_builder.rs
+++ b/src/util/storable_builder.rs
@@ -47,7 +47,7 @@ impl<T: EntropySource> StorableBuilder<T> {
 		&self, input: Vec<u8>, version: i64, data_encryption_key: &[u8; 32], aad: &[u8],
 	) -> Storable {
 		let mut nonce = [0u8; NONCE_LENGTH];
-		self.entropy_source.fill_bytes(&mut nonce[4..]);
+		self.entropy_source.fill_bytes(&mut nonce);
 
 		let mut data_blob = PlaintextBlob { value: input, version }.encode_to_vec();