DS-1581 Prevent double-up of restriction message