diff --git a/cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/export/CgmesExportContext.java b/cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/export/CgmesExportContext.java
index fdade42bb61..dbfb44b039f 100644
--- a/cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/export/CgmesExportContext.java
+++ b/cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/export/CgmesExportContext.java
@@ -689,11 +689,11 @@ public BaseVoltageMapping.BaseVoltageSource getBaseVoltageByNominalVoltage(doubl
     }
 
     public boolean writeConnectivityNodes() {
-        boolean writeConnectivityNodes = cim.writeConnectivityNodes();
-        if (!writeConnectivityNodes) {
+        if (getCimVersion() == 100) {
+            return true;
+        } else {
             return topologyKind == CgmesTopologyKind.NODE_BREAKER;
         }
-        return true;
     }
 
     public Collection<String> getRegionsIds() {
diff --git a/cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/export/EquipmentExport.java b/cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/export/EquipmentExport.java
index 7a56f7b454a..4d532335272 100644
--- a/cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/export/EquipmentExport.java
+++ b/cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/export/EquipmentExport.java
@@ -63,8 +63,6 @@ public static void write(Network network, XMLStreamWriter writer, CgmesExportCon
 
     public static void write(Network network, XMLStreamWriter writer, CgmesExportContext context, CgmesMetadataModel model) {
         try {
-            boolean writeConnectivityNodes = context.writeConnectivityNodes();
-
             String cimNamespace = context.getCim().getNamespace();
             String euNamespace = context.getCim().getEuNamespace();
             CgmesExportUtil.writeRdfRoot(cimNamespace, context.getCim().getEuPrefix(), euNamespace, writer);
@@ -80,7 +78,7 @@ public static void write(Network network, XMLStreamWriter writer, CgmesExportCon
             Set<String> exportedLimitTypes = new HashSet<>();
             LoadGroups loadGroups = new LoadGroups();
 
-            if (writeConnectivityNodes) {
+            if (context.writeConnectivityNodes()) {
                 writeConnectivityNodes(network, mapNodeKey2NodeId, cimNamespace, writer, context);
             }
             writeTerminals(network, mapTerminal2Id, mapNodeKey2NodeId, cimNamespace, writer, context);
diff --git a/cgmes/cgmes-model/src/main/java/com/powsybl/cgmes/model/CgmesNamespace.java b/cgmes/cgmes-model/src/main/java/com/powsybl/cgmes/model/CgmesNamespace.java
index 51c0cf94c56..02142b0be98 100644
--- a/cgmes/cgmes-model/src/main/java/com/powsybl/cgmes/model/CgmesNamespace.java
+++ b/cgmes/cgmes-model/src/main/java/com/powsybl/cgmes/model/CgmesNamespace.java
@@ -88,8 +88,6 @@ public interface Cim {
         String getEuPrefix();
 
         String getEuNamespace();
-
-        boolean writeConnectivityNodes();
     }
 
     private abstract static class AbstractCim implements Cim {
@@ -144,11 +142,6 @@ public String getEuNamespace() {
             throw new PowsyblException("Undefined EU namespace for version 14");
         }
 
-        @Override
-        public boolean writeConnectivityNodes() {
-            return false;
-        }
-
         private Cim14() {
             super(14, CIM_14_NAMESPACE);
         }
@@ -200,11 +193,6 @@ private AbstractCim16AndAbove(int version, String namespace, String euPrefix, St
 
     private static final class Cim16 extends AbstractCim16AndAbove {
 
-        @Override
-        public boolean writeConnectivityNodes() {
-            return false;
-        }
-
         private Cim16() {
             super(16, CIM_16_NAMESPACE, "entsoe", ENTSOE_NAMESPACE,
                     Map.of("EQ", CIM_16_EQ_PROFILE, "EQ_OP",
@@ -216,11 +204,6 @@ private Cim16() {
 
     private static final class Cim100 extends AbstractCim16AndAbove {
 
-        @Override
-        public boolean writeConnectivityNodes() {
-            return true;
-        }
-
         private Cim100() {
             super(100, CIM_100_NAMESPACE, "eu", EU_NAMESPACE,
                     Map.of("EQ", CIM_100_EQ_PROFILE, "EQ_OP", CIM_100_EQ_OPERATION_PROFILE,