Fix for duplicated device_registration_id