diff --git a/src/format/KeePass2Reader.cpp b/src/format/KeePass2Reader.cpp
index b45cefa6c..17e007d76 100644
--- a/src/format/KeePass2Reader.cpp
+++ b/src/format/KeePass2Reader.cpp
@@ -115,6 +115,7 @@ Database* KeePass2Reader::readDatabase(QIODevice* device, const CompositeKey& ke
 
     CryptoHash hash(CryptoHash::Sha256);
     hash.addData(m_masterSeed);
+    hash.addData(m_db->challengeMasterSeed(m_masterSeed));
     hash.addData(m_db->transformedMasterKey());
     QByteArray finalKey = hash.result();
 
diff --git a/src/format/KeePass2Writer.cpp b/src/format/KeePass2Writer.cpp
index dfbbf3532..3a3195a0b 100644
--- a/src/format/KeePass2Writer.cpp
+++ b/src/format/KeePass2Writer.cpp
@@ -53,6 +53,7 @@ void KeePass2Writer::writeDatabase(QIODevice* device, Database* db)
 
     CryptoHash hash(CryptoHash::Sha256);
     hash.addData(masterSeed);
+    hash.addData(db->challengeMasterSeed(masterSeed));
     Q_ASSERT(!db->transformedMasterKey().isEmpty());
     hash.addData(db->transformedMasterKey());
     QByteArray finalKey = hash.result();