diff --git a/Cartfile b/Cartfile
index ea65d075..dcf9cb51 100644
--- a/Cartfile
+++ b/Cartfile
@@ -1,3 +1,3 @@
 github "sparkle-project/Sparkle" ~> 1.17.0
-github "mstarke/KeePassKit" "90ec19a82a9f97db67dde15ea145b9f4990b3e2b"
+github "mstarke/KeePassKit" "232cda8a0fce2a97963564ecd09c11f6730bab42"
 github "mstarke/HNHUi" ~> 1.1
diff --git a/Cartfile.resolved b/Cartfile.resolved
index f860bf8f..3d713382 100644
--- a/Cartfile.resolved
+++ b/Cartfile.resolved
@@ -1,3 +1,3 @@
 github "mstarke/HNHUi" "1.1"
-github "mstarke/KeePassKit" "90ec19a82a9f97db67dde15ea145b9f4990b3e2b"
+github "mstarke/KeePassKit" "232cda8a0fce2a97963564ecd09c11f6730bab42"
 github "sparkle-project/Sparkle" "1.17.0"
diff --git a/MacPass/MPDocument.m b/MacPass/MPDocument.m
index af0786f4..af09911f 100644
--- a/MacPass/MPDocument.m
+++ b/MacPass/MPDocument.m
@@ -346,6 +346,7 @@ NSString *const MPDocumentGroupKey                            = @"MPDocumentGrou
     return;
   }
   self.tree = nil;
+  self.compositeKey = nil;
   [[NSNotificationCenter defaultCenter] postNotificationName:MPDocumentDidLockDatabaseNotification object:self];
 }