diff --git a/plugins/org.eclipse.sirius.diagram.elk/src/org/eclipse/sirius/diagram/elk/GmfLayoutEditPolicy.java b/plugins/org.eclipse.sirius.diagram.elk/src/org/eclipse/sirius/diagram/elk/GmfLayoutEditPolicy.java
index ff5cada2d3..c44b4ab920 100644
--- a/plugins/org.eclipse.sirius.diagram.elk/src/org/eclipse/sirius/diagram/elk/GmfLayoutEditPolicy.java
+++ b/plugins/org.eclipse.sirius.diagram.elk/src/org/eclipse/sirius/diagram/elk/GmfLayoutEditPolicy.java
@@ -395,7 +395,7 @@ private void addEdgeLayout(final GmfLayoutCommand command, final ElkEdge elkEdge
             // coordinates
             KVectorChain junctionPoints = elkEdge.getProperty(CoreOptions.JUNCTION_POINTS);
             String serializedJP = null;
-            if (junctionPoints != null) {
+            if (junctionPoints != null && !junctionPoints.isEmpty()) {
                 for (KVector point : junctionPoints) {
                     ElkUtil.toAbsolute(point, elkEdge.getContainingNode());
                 }