Fix major sync issue caused by a race condition

This release fixes major sync issue on mostly static entities caused by a race condition: thank you @regevbr.