For ENG-6022, fix what I think is the missing synchronization that leaks...

... a buffer