diff --git a/packages/client/src/automerge-editor.ts b/packages/client/src/automerge-editor.ts
index 541eb81..de9dce3 100644
--- a/packages/client/src/automerge-editor.ts
+++ b/packages/client/src/automerge-editor.ts
@@ -99,10 +99,14 @@ export const AutomergeEditor = {
     e.docSet.setDoc(docId, mergedDoc)
 
     Editor.withoutNormalizing(e, () => {
-      e.children = toJS(mergedDoc).children
-
-      e.onChange()
+      const doc = toJS(mergedDoc)
+      e.children = doc.children
+      e.onCursor && e.onCursor(doc.cursors)
     })
+
+    // onChange expect valid doc, we make sure do normalization before that.
+    Editor.normalize(e, { force: true })
+    e.onChange()
   },
 
   /**