diff --git a/frontend/src/app/main/data/workspace/common.cljs b/frontend/src/app/main/data/workspace/common.cljs
index 7b079dea39..06a77f6487 100644
--- a/frontend/src/app/main/data/workspace/common.cljs
+++ b/frontend/src/app/main/data/workspace/common.cljs
@@ -283,7 +283,8 @@
           items (conj-undo-entry items entry)]
       (-> state
           (update :workspace-undo assoc :items items
-                                        :index (inc index))))
+                                        :index (min (inc index)
+                                                    (dec MAX-UNDO-SIZE)))))
     state))
 
 (defn- accumulate-undo-entry