diff --git a/lib/index.js b/lib/index.js
index 9fd73d8..b675f4a 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -500,7 +500,7 @@ function initDB(peer, config) {
       if (err) return cb(new Error('add() failed to remove ghost', { cause: err }))
       logAppend(msgID, msg, (err, rec) => {
         if (err) return cb(new Error('add() failed in the log', { cause: err }))
-        onRecordAdded.set(rec)
+        queueMicrotask(() => onRecordAdded.set(rec))
         cb(null, rec)
       })
     })
@@ -669,7 +669,7 @@ function initDB(peer, config) {
     logAppend(msgID, msg, (err, rec) => {
       // prettier-ignore
       if (err) return cb(new Error('account.create() failed in the log', { cause: err }))
-      onRecordAdded.set(rec)
+      queueMicrotask(() => onRecordAdded.set(rec))
       cb(null, rec.id)
     })
   }
@@ -866,7 +866,7 @@ function initDB(peer, config) {
     logAppend(msgID, msg, (err, rec) => {
       // prettier-ignore
       if (err) return cb(new Error('account.add() failed to append the log', { cause: err }))
-      onRecordAdded.set(rec)
+      queueMicrotask(() => onRecordAdded.set(rec))
       cb(null, rec)
     })
   }
@@ -970,7 +970,7 @@ function initDB(peer, config) {
       logAppend(msgID, msg, (err, rec) => {
         // prettier-ignore
         if (err) return cb(new Error('feed.publish() failed to append the log', { cause: err }))
-        onRecordAdded.set(rec)
+        queueMicrotask(() => onRecordAdded.set(rec))
         cb(null, rec)
       })
     })
diff --git a/test/on-record-added.test.js b/test/on-record-added.test.js
index 0bca52f..8c11077 100644
--- a/test/on-record-added.test.js
+++ b/test/on-record-added.test.js
@@ -19,11 +19,20 @@ test('onRecordAdded', async (t) => {
 
   await peer.db.loaded()
 
-  const account = await p(peer.db.account.create)({ subdomain: 'person' })
+  const account = await p(peer.db.account.create)({
+    subdomain: 'person',
+    _nonce: 'alice',
+  })
 
-  const listened = []
-  var remove = peer.db.onRecordAdded((ev) => {
-    listened.push(ev)
+  let publishedRec1 = false
+  const listenedRecs = []
+
+  var remove = peer.db.onRecordAdded((rec) => {
+    listenedRecs.push(rec)
+    if (rec.msg.data?.text === 'I am hungry') {
+      console.log(rec);
+      assert.equal(publishedRec1, true, 'onRecordAdded triggered after publish')
+    }
   })
 
   const rec1 = await p(peer.db.feed.publish)({
@@ -31,15 +40,16 @@ test('onRecordAdded', async (t) => {
     domain: 'post',
     data: { text: 'I am hungry' },
   })
+  publishedRec1 = true
   assert.equal(rec1.msg.data.text, 'I am hungry', 'msg1 text correct')
 
   await p(setTimeout)(500)
 
-  assert.equal(listened.length, 3)
-  assert.equal(listened[0].msg.metadata.account, 'self', 'account root')
-  assert.equal(listened[1].msg.data, null, 'root')
-  assert.equal(listened[1].msg.metadata.dataSize, 0, 'root')
-  assert.deepEqual(listened[2], rec1, 'actual record')
+  assert.equal(listenedRecs.length, 3)
+  assert.equal(listenedRecs[0].msg.metadata.account, 'self', 'account root')
+  assert.equal(listenedRecs[1].msg.data, null, 'root')
+  assert.equal(listenedRecs[1].msg.metadata.dataSize, 0, 'root')
+  assert.deepEqual(listenedRecs[2], rec1, 'actual record')
 
   remove()
   await p(peer.close)(true)