Fix HAL-465: Unable to remove server config