diff --git a/Examples/xx-messenger/Sources/AppCore/AuthCallbackHandler/AuthCallbackHandlerRequest.swift b/Examples/xx-messenger/Sources/AppCore/AuthCallbackHandler/AuthCallbackHandlerRequest.swift
index e8f14806ba8d088dc976365741387b502e7bbb42..d8ac3d18a496b64427b293fcc476c341d93353cb 100644
--- a/Examples/xx-messenger/Sources/AppCore/AuthCallbackHandler/AuthCallbackHandlerRequest.swift
+++ b/Examples/xx-messenger/Sources/AppCore/AuthCallbackHandler/AuthCallbackHandlerRequest.swift
@@ -33,6 +33,8 @@ extension AuthCallbackHandlerRequest {
       dbContact = try db().saveContact(dbContact)
 
       do {
+        try messenger.waitForNetwork()
+        try messenger.waitForNodes()
         let verified = try messenger.verifyContact(xxContact)
         dbContact.authStatus = verified ? .verified : .verificationFailed
         dbContact = try db().saveContact(dbContact)
diff --git a/Examples/xx-messenger/Tests/AppCoreTests/AuthCallbackHandler/AuthCallbackHandlerRequestTests.swift b/Examples/xx-messenger/Tests/AppCoreTests/AuthCallbackHandler/AuthCallbackHandlerRequestTests.swift
index 07359d1f99234d8faabf1b0b9dff29c6af963b70..65786884bfbe0821343509f20bd1f0942998768d 100644
--- a/Examples/xx-messenger/Tests/AppCoreTests/AuthCallbackHandler/AuthCallbackHandlerRequestTests.swift
+++ b/Examples/xx-messenger/Tests/AppCoreTests/AuthCallbackHandler/AuthCallbackHandlerRequestTests.swift
@@ -14,6 +14,8 @@ final class AuthCallbackHandlerRequestTests: XCTestCase {
     var didSaveContact: [XXModels.Contact] = []
 
     var messenger: Messenger = .unimplemented
+    messenger.waitForNetwork.run = { _ in }
+    messenger.waitForNodes.run = { _, _, _, _ in }
     messenger.verifyContact.run = { contact in
       didVerifyContact.append(contact)
       return true
@@ -91,6 +93,8 @@ final class AuthCallbackHandlerRequestTests: XCTestCase {
     var didSaveContact: [XXModels.Contact] = []
 
     var messenger: Messenger = .unimplemented
+    messenger.waitForNetwork.run = { _ in }
+    messenger.waitForNodes.run = { _, _, _, _ in }
     messenger.verifyContact.run = { _ in false }
 
     let request = AuthCallbackHandlerRequest.live(
@@ -135,6 +139,8 @@ final class AuthCallbackHandlerRequestTests: XCTestCase {
     var didSaveContact: [XXModels.Contact] = []
 
     var messenger: Messenger = .unimplemented
+    messenger.waitForNetwork.run = { _ in }
+    messenger.waitForNodes.run = { _, _, _, _ in }
     messenger.verifyContact.run = { _ in throw failure }
 
     let request = AuthCallbackHandlerRequest.live(