diff --git a/Annex/Content.hs b/Annex/Content.hs
index 296eda8885..a42d01cc77 100644
--- a/Annex/Content.hs
+++ b/Annex/Content.hs
@@ -867,6 +867,7 @@ getKeysPresent keyloc = do
 saveState :: Bool -> Annex ()
 saveState nocommit = doSideAction $ do
 	Annex.Queue.flush
+	Database.Keys.closeDb
 	unless nocommit $
 		whenM (annexAlwaysCommit <$> Annex.getGitConfig) $
 			Annex.Branch.commit =<< Annex.Branch.commitMessage