LPS-48784 properly handle unregistrations