diff --git a/configmgr/source/xcuparser.cxx b/configmgr/source/xcuparser.cxx
index 4746bcf9300a..7d5a2a734d55 100644
--- a/configmgr/source/xcuparser.cxx
+++ b/configmgr/source/xcuparser.cxx
@@ -1109,7 +1109,8 @@ void XcuParser::handleSetNode(xmlreader::XmlReader & reader, SetNode * set) {
             bool known = i != set->getMembers().end();
             if (known && !state_.top().locked &&
                 finalizedLayer >= valueParser_.getLayer() &&
-                (!mandatory || mandatoryLayer > valueParser_.getLayer()))
+                (mandatoryLayer == Data::NO_LAYER ||
+                 mandatoryLayer > valueParser_.getLayer()))
             {
                 set->getMembers().erase(i);
             }