diff --git a/src/main/frontend/db/rtc/core.cljs b/src/main/frontend/db/rtc/core.cljs
index a13cbb390c..1ef68323fb 100644
--- a/src/main/frontend/db/rtc/core.cljs
+++ b/src/main/frontend/db/rtc/core.cljs
@@ -551,7 +551,6 @@
                          update-block-uuid->attrs)]
     [update-page-ops remove-ops move-ops update-ops remove-page-ops]))
 
-
 (defn- <get-N-ops
   [repo n]
   (go
diff --git a/src/main/frontend/db/rtc/db_listener.cljs b/src/main/frontend/db/rtc/db_listener.cljs
index f613fe7cac..e4fc29c42e 100644
--- a/src/main/frontend/db/rtc/db_listener.cljs
+++ b/src/main/frontend/db/rtc/db_listener.cljs
@@ -155,12 +155,23 @@
                      (prn ::add-ops ops)
                      (<! (op/<add-ops! repo ops))))))))
 
+(defn- sort-entity-datoms-coll
+  [entity-datoms-coll]
+  (let [id->datoms
+        (into {}
+              (keep (fn [datoms]
+                      (when-let [e (ffirst datoms)]
+                        [e datoms])))
+              entity-datoms-coll)]
+    (mapv second (sort-by first < id->datoms))))
+
 (defn generate-rtc-ops
   [repo db-before db-after datoms]
   (let [same-entity-datoms-coll (->> datoms
                                      (map vec)
                                      (group-by first)
-                                     vals)
+                                     vals
+                                     sort-entity-datoms-coll)
         ops (mapcat (partial entity-datoms=>ops repo db-before db-after) same-entity-datoms-coll)]
     (when (seq ops)
       (swap! *ops-pending-to-store conj {:ops ops :repo repo}))))
diff --git a/src/main/frontend/db/rtc/ops_idb_store.cljs b/src/main/frontend/db/rtc/ops_idb_store.cljs
index 90fec445cc..55fc82810d 100644
--- a/src/main/frontend/db/rtc/ops_idb_store.cljs
+++ b/src/main/frontend/db/rtc/ops_idb_store.cljs
@@ -30,7 +30,7 @@
 (defn- <add-ops*!
   [repo ops]
   (let [store (ensure-store repo)
-        key* (tc/to-long (t/now))]
+        key* (* 1000 (tc/to-long (t/now)))]
     (p/loop [key* key* ops ops]
       (let [[op & other-ops] ops]
         (when op
@@ -42,11 +42,13 @@
 
 (defonce ^:private add-ops-ch (async/chan 100))
 (defonce #_:clj-kondo/ignore _add-ops-loop
-  (async/go-loop []
-    (if-let [[repo ops] (async/<! add-ops-ch)]
-      (do (async/<! (p->c (<add-ops*! repo ops)))
-          (recur))
-      (recur))))
+  (let [id (random-uuid)]
+    (async/go-loop []
+      (prn ::add-ops-loop id)
+      (if-let [[repo ops] (async/<! add-ops-ch)]
+        (do (async/<! (p->c (<add-ops*! repo ops)))
+            (recur))
+        (recur)))))
 
 (defn <add-ops!
   [repo ops]
diff --git a/src/test/frontend/db/rtc/rtc_effects_test.cljs b/src/test/frontend/db/rtc/rtc_effects_test.cljs
index f015d6e1f7..7a86dedf1b 100644
--- a/src/test/frontend/db/rtc/rtc_effects_test.cljs
+++ b/src/test/frontend/db/rtc/rtc_effects_test.cljs
@@ -91,7 +91,7 @@
        (let [conn (conn/get-db test-helper/test-db false)
              ws @(:*ws @rtc-fixture/*test-rtc-state)
              push-data-to-client-chan (:push-data-to-client-chan ws)]
-       ;; set local-t & graph-uuid in mock-indexeddb-store
+         ;; set local-t & graph-uuid in mock-indexeddb-store
          (<! (rtc-op/<update-local-tx! test-helper/test-db rtc-fixture/test-graph-init-local-t))
          (<! (rtc-op/<update-graph-uuid! test-helper/test-db rtc-fixture/test-graph-uuid))
          (>! push-data-to-client-chan {:req-id "push-updates"