diff --git a/src/main/frontend/handler/history.cljs b/src/main/frontend/handler/history.cljs
index b037cd66be..9ee0116b9d 100644
--- a/src/main/frontend/handler/history.cljs
+++ b/src/main/frontend/handler/history.cljs
@@ -25,7 +25,8 @@
   (let [route-data (:route-data state)
         current-route (:route-match @state/state)
         current-route-data (db-browser/get-route-data current-route)]
-    (when (and (not= route-data current-route-data) route-data)
+    (when (and (not= route-data current-route-data) route-data
+               (contains? #{:home :page :page-block :all-journals} (:to route-data)))
       (route-handler/redirect! route-data))
     (swap! state/state merge (dissoc state :route-data))))
 
diff --git a/src/main/frontend/persist_db/browser.cljs b/src/main/frontend/persist_db/browser.cljs
index 24c7a95380..a9f7aa7ed7 100644
--- a/src/main/frontend/persist_db/browser.cljs
+++ b/src/main/frontend/persist_db/browser.cljs
@@ -57,9 +57,7 @@
                                (assoc :route-data (get-route-data (:route-match state)))))
                        old-state (f prev)
                        new-state (f current)]
-                   (when (and (not= new-state old-state)
-                              (not (and (= (dissoc new-state :route-data) (dissoc old-state :route-data))
-                                        (not (contains? #{:page :page-block :home :all-journals} (:to (:route-data new-state)))))))
+                   (when (not= new-state old-state)
                      (.sync-ui-state worker (state/get-current-repo)
                                      (ldb/write-transit-str {:old-state old-state
                                                              :new-state new-state}))))))))
diff --git a/src/main/frontend/worker/undo_redo2.cljs b/src/main/frontend/worker/undo_redo2.cljs
index 6b41cceb89..217324cda4 100644
--- a/src/main/frontend/worker/undo_redo2.cljs
+++ b/src/main/frontend/worker/undo_redo2.cljs
@@ -49,7 +49,7 @@
 
 (def ^:private undo-op-validator (m/validator [:sequential undo-op-item-schema]))
 
-(defonce max-stack-length 500)
+(defonce max-stack-length 100)
 (defonce *undo-ops (:undo/repo->ops @worker-state/*state))
 (defonce *redo-ops (:redo/repo->ops @worker-state/*state))