issue #19550: Do not unset things unless we are ready
issue #19550: Do need to unset if ready but no item.