diff --git a/MacPass/MPDocument.m b/MacPass/MPDocument.m
index e5091a92..7cdbc67f 100644
--- a/MacPass/MPDocument.m
+++ b/MacPass/MPDocument.m
@@ -281,6 +281,7 @@ NSString *const MPDocumentGroupKey                        = @"MPDocumentGroupKey
   [self saveDocument:sender];
   self.encryptedData = [self.tree encryptWithPassword:self.compositeKey forVersion:KPKXmlVersion error:&error];
   self.tree = nil;
+  [self.undoManager removeAllActions];
   [[NSNotificationCenter defaultCenter] postNotificationName:MPDocumentDidLockDatabaseNotification object:self];
 }