[#69807070] Fix some race conditions in a faster way

Signed-off-by: Rick Copeland <rick@synapp.io>