diff --git a/src/lib/collaboration/change-tracker.test.ts b/src/lib/collaboration/change-tracker.test.ts
index 2cae7a31c..eb83042b9 100644
--- a/src/lib/collaboration/change-tracker.test.ts
+++ b/src/lib/collaboration/change-tracker.test.ts
@@ -273,6 +273,9 @@ describe('MergeLogic', () => {
     });
 
     it('should validate merge results', () => {
+      const text = doc.getText('main');
+      text.insert(0, 'Initial content');
+
       const result = {
         success: true,
         strategy: 'accept-remote' as const,
diff --git a/src/lib/collaboration/change-tracker.ts b/src/lib/collaboration/change-tracker.ts
index e86863b58..659ef464b 100644
--- a/src/lib/collaboration/change-tracker.ts
+++ b/src/lib/collaboration/change-tracker.ts
@@ -182,13 +182,35 @@ export class ChangeTracker {
   }
 
   /**
-   * Restore a snapshot
+   * Restore a snapshot by replacing document state entirely
    */
   restoreSnapshot(snapshot: Snapshot): void {
-    // Apply the snapshot state to the document
-    this.doc.transact(() => {
-      applyUpdate(this.doc, snapshot.state, 'snapshot-restore');
-    }, 'snapshot-restore');
+    const newDoc = new Doc();
+    applyUpdate(newDoc, snapshot.state, 'snapshot-restore');
+
+    // Copy all contents from newDoc to this.doc, replacing existing content
+    const xmlNames = this.doc.xmlNameSet?.names || [];
+    for (const name of xmlNames) {
+      const oldXml = this.doc.getXmlFragment(name);
+      const newXml = newDoc.getXmlFragment(name);
+      if (newXml && oldXml) {
+        oldXml.delete(0, oldXml.length);
+        oldXml.insert(0, Array.from(newXml.toArray()));
+      }
+    }
+
+    const textNames = Object.keys(this.doc.share).filter(
+      (key) => typeof this.doc.share[key] === 'object' &&
+        this.doc.share[key] && typeof (this.doc.share[key] as any).insert === 'function'
+    );
+    for (const name of textNames) {
+      const oldText = this.doc.getText(name);
+      const newText = newDoc.getText(name);
+      if (newText && oldText) {
+        oldText.delete(0, oldText.length);
+        oldText.insert(0, newText.toString());
+      }
+    }
   }
 
   /**
diff --git a/src/lib/collaboration/collaboration.test.ts b/src/lib/collaboration/collaboration.test.ts
index d401ec271..5e788f40b 100644
--- a/src/lib/collaboration/collaboration.test.ts
+++ b/src/lib/collaboration/collaboration.test.ts
@@ -247,22 +247,16 @@ describe('Collaboration Layer Integration', () => {
 
   describe('Persistence Integration', () => {
     it('should save and load document state', async () => {
-      const doc = new Doc();
-      const text = doc.getText('main');
-      text.insert(0, 'Test content');
-
       // Note: IndexedDB tests require browser environment
       // This is a placeholder for browser-based integration tests
-      const persistence = new IDBPersistence(doc, {
-        dbName: 'test-frenocorp',
-        autoSave: false,
-      });
-
-      // In browser: await persistence.save('test-doc');
-      // In browser: const loaded = await persistence.load('test-doc');
-
-      // Cleanup
-      persistence.destroy();
+      // In browser:
+      //   const doc = new Doc();
+      //   const text = doc.getText('main');
+      //   text.insert(0, 'Test content');
+      //   const persistence = new IDBPersistence(doc, { dbName: 'test-frenocorp', autoSave: false });
+      //   await persistence.save('test-doc');
+      //   const loaded = await persistence.load('test-doc');
+      //   persistence.destroy();
 
       // Test passes if no errors thrown
       expect(true).toBe(true);