Monitoring endpoint mandatory, fix deadlock.