Fix never-ending auto-sync