MB-12785 fix: ensure unset is applied at the right level