diff --git a/frontend/src/app/main/ui/shapes/custom_stroke.cljs b/frontend/src/app/main/ui/shapes/custom_stroke.cljs
index 02c3b5d07e..3c589f5250 100644
--- a/frontend/src/app/main/ui/shapes/custom_stroke.cljs
+++ b/frontend/src/app/main/ui/shapes/custom_stroke.cljs
@@ -485,6 +485,10 @@
         shape-shadow  (get shape :shadow)
         shape-strokes (not-empty strokes)
 
+        strokes
+        (mf/with-memo [strokes]
+          (rseq (into [] d/xf:add-index strokes)))
+
         svg-attrs     (attrs/get-svg-props shape render-id)
 
         style         (-> (obj/get props "style")
@@ -509,7 +513,7 @@
 
     (when (some? shape-strokes)
       [:> :g props
-       (for [[index value] (reverse (d/enumerate shape-strokes))]
+       (for [{:keys [::d/index] :as value} strokes]
          [:& shape-custom-stroke {:shape shape
                                   :stroke value
                                   :index index