resolve deadlock introduced by snapshot code

Testing needs to be added to check this branch of code, as the tests were not failing and this deadlock was only detected in production.