diff --git a/frontend/src/app/main/data/workspace/fix_broken_shape_links.cljs b/frontend/src/app/main/data/workspace/fix_broken_shape_links.cljs
index 2866d97417..a9443b2fab 100644
--- a/frontend/src/app/main/data/workspace/fix_broken_shape_links.cljs
+++ b/frontend/src/app/main/data/workspace/fix_broken_shape_links.cljs
@@ -31,8 +31,10 @@
                      (mapcat (partial generate-changes :component-id)
                              (vals (:components data))))]
 
-        (rx/of (dch/commit-changes
-                {:origin it
-                 :redo-changes (vec changes)
-                 :undo-changes []
-                 :save-undo? false}))))))
+        (if (seq changes)
+          (rx/of (dch/commit-changes
+                  {:origin it
+                   :redo-changes (vec changes)
+                   :undo-changes []
+                   :save-undo? false}))
+          (rx/empty))))))