diff --git a/cgmes/cgmes-conversion/src/test/resources/issues/operational-limits/limitsets_associated_to_equipments_EQ.xml b/cgmes/cgmes-conversion/src/test/resources/issues/operational-limits/limitsets_associated_to_equipments_EQ.xml
index b586b334711..6e3c1584327 100644
--- a/cgmes/cgmes-conversion/src/test/resources/issues/operational-limits/limitsets_associated_to_equipments_EQ.xml
+++ b/cgmes/cgmes-conversion/src/test/resources/issues/operational-limits/limitsets_associated_to_equipments_EQ.xml
@@ -104,7 +104,6 @@
     <cim:ACLineSegment.x>1</cim:ACLineSegment.x>
     <cim:ACLineSegment.x0>0.1</cim:ACLineSegment.x0>
     <cim:ConductingEquipment.BaseVoltage rdf:resource="#_BV"/>
-    <cim:Equipment.EquipmentContainer rdf:resource="#_LN"/>
 </cim:ACLineSegment>
 <cim:OperationalLimitSet rdf:ID="_OLS_ACL">
     <cim:IdentifiedObject.name>Limit set</cim:IdentifiedObject.name>
diff --git a/cgmes/cgmes-model/src/main/resources/CIM16.sparql b/cgmes/cgmes-model/src/main/resources/CIM16.sparql
index 2ac8ae113eb..a4d610a0361 100644
--- a/cgmes/cgmes-model/src/main/resources/CIM16.sparql
+++ b/cgmes/cgmes-model/src/main/resources/CIM16.sparql
@@ -384,8 +384,8 @@ WHERE
     # operational limit sets can be attached to terminals or equipments
     OPTIONAL { ?OperationalLimitSet cim:OperationalLimitSet.Terminal ?Terminal }
     OPTIONAL { GRAPH ?graph2 {
-        ?OperationalLimitSet cim:OperationalLimitSet.Equipment ?Equipment .
-        ?Equipment cim:Equipment.EquipmentContainer ?EquipmentContainer
+        ?OperationalLimitSet cim:OperationalLimitSet.Equipment ?Equipment
+        OPTIONAL { ?Equipment cim:Equipment.EquipmentContainer ?EquipmentContainer }
     }}
     ?OperationalLimitType
         a cim:OperationalLimitType ;