diff --git a/MacPass/MPDocument.m b/MacPass/MPDocument.m
index a5eafbc4..2444393e 100644
--- a/MacPass/MPDocument.m
+++ b/MacPass/MPDocument.m
@@ -440,6 +440,8 @@ NSString *const MPDocumentGroupKey                            = @"MPDocumentGrou
   }
   self.tree = nil;
   self.compositeKey = nil;
+  self.selectedGroups = nil;
+  self.selectedEntries = nil;
   [NSNotificationCenter.defaultCenter postNotificationName:MPDocumentDidLockDatabaseNotification object:self];
 }