fix: Better lock handling on close (backport #1024)

fix: Better lock handling on close (backport #1024) #2322