diff --git a/src/Mod/Draft/draftobjects/draftlink.py b/src/Mod/Draft/draftobjects/draftlink.py
index 47b51b77e5..591385037e 100644
--- a/src/Mod/Draft/draftobjects/draftlink.py
+++ b/src/Mod/Draft/draftobjects/draftlink.py
@@ -186,18 +186,18 @@ class DraftLink(DraftObject):
 
     def buildShape(self, obj, pl, pls):
         """Build the shape of the link object."""
-        if obj.Count != len(pls):
-            obj.Count = len(pls)
-
         if self.use_link:
-            if not getattr(obj, 'ExpandArray', False):
+            if not getattr(obj, 'ExpandArray', False) or obj.Count != len(pls):
                 obj.setPropertyStatus('PlacementList', '-Immutable')
                 obj.PlacementList = pls
                 obj.setPropertyStatus('PlacementList', 'Immutable')
+                obj.Count = len(pls)
             if getattr(obj, 'ExpandArray', False) \
                     and getattr(obj, 'AlwaysSyncPlacement', False):
                 for pla,child in zip(pls,obj.ElementList):
                     child.Placement = pla
+        elif obj.Count != len(pls):
+            obj.Count = len(pls)
 
         if obj.Base:
             shape = getattr(obj.Base, 'Shape', None)