diff --git a/Sources/XXMessengerClient/Messenger/Functors/MessengerLogIn.swift b/Sources/XXMessengerClient/Messenger/Functors/MessengerLogIn.swift
index 31323e9f436ca294c2139a0e5d7a3e7e5bad0731..51e970d5db4798ae46d7b98e6e0b8cbbebeea0cf 100644
--- a/Sources/XXMessengerClient/Messenger/Functors/MessengerLogIn.swift
+++ b/Sources/XXMessengerClient/Messenger/Functors/MessengerLogIn.swift
@@ -23,9 +23,6 @@ extension MessengerLogIn {
       guard let e2e = env.ctx.getE2E() else {
         throw Error.notConnected
       }
-      if cMix.networkFollowerStatus() != .running {
-        try cMix.startNetworkFollower(timeoutMS: 30_000)
-      }
       env.ctx.setUD(try env.newOrLoadUd(
         params: .init(
           e2eId: e2e.getId(),
diff --git a/Sources/XXMessengerClient/Messenger/Functors/MessengerRegister.swift b/Sources/XXMessengerClient/Messenger/Functors/MessengerRegister.swift
index 0fdddac81a2e2152bce3a3f5d77911663647d01f..35450762aaecb623755182f770dbbc6953714931 100644
--- a/Sources/XXMessengerClient/Messenger/Functors/MessengerRegister.swift
+++ b/Sources/XXMessengerClient/Messenger/Functors/MessengerRegister.swift
@@ -25,9 +25,6 @@ extension MessengerRegister {
       guard let e2e = env.ctx.getE2E() else {
         throw Error.notConnected
       }
-      if cMix.networkFollowerStatus() != .running {
-        try cMix.startNetworkFollower(timeoutMS: 30_000)
-      }
       env.ctx.setUD(try env.newOrLoadUd(
         params: .init(
           e2eId: e2e.getId(),
diff --git a/Tests/XXMessengerClientTests/Messenger/Functors/MessengerLogInTests.swift b/Tests/XXMessengerClientTests/Messenger/Functors/MessengerLogInTests.swift
index 77061ed5280f74ca222f60347d5843006ef8ea1b..3186d0acb3fa6ac5cd2820480c2a2dc49814428c 100644
--- a/Tests/XXMessengerClientTests/Messenger/Functors/MessengerLogInTests.swift
+++ b/Tests/XXMessengerClientTests/Messenger/Functors/MessengerLogInTests.swift
@@ -5,7 +5,6 @@ import XXClient
 
 final class MessengerLogInTests: XCTestCase {
   func testLogin() throws {
-    var didStartNetworkFollower: [Int] = []
     var didNewOrLoadUDWithParams: [NewOrLoadUd.Params] = []
     var didNewOrLoadUDWithFollower: [UdNetworkStatus] = []
     var didSetUD: [UserDiscovery?] = []
@@ -20,9 +19,6 @@ final class MessengerLogInTests: XCTestCase {
     env.ctx.getCMix = {
       var cMix: CMix = .unimplemented
       cMix.networkFollowerStatus.run = { networkFollowerStatus }
-      cMix.startNetworkFollower.run = { timeout in
-        didStartNetworkFollower.append(timeout)
-      }
       return cMix
     }
     env.ctx.getE2E = {
@@ -45,7 +41,6 @@ final class MessengerLogInTests: XCTestCase {
     let logIn: MessengerLogIn = .live(env)
     try logIn()
 
-    XCTAssertEqual(didStartNetworkFollower, [30_000])
     XCTAssertNoDifference(didNewOrLoadUDWithParams, [.init(
       e2eId: e2eId,
       username: nil,
@@ -131,25 +126,6 @@ final class MessengerLogInTests: XCTestCase {
     }
   }
 
-  func testStartNetworkFollowerFailure() {
-    struct Error: Swift.Error, Equatable {}
-    let error = Error()
-
-    var env: MessengerEnvironment = .unimplemented
-    env.ctx.getCMix = {
-      var cMix: CMix = .unimplemented
-      cMix.networkFollowerStatus.run = { .stopped }
-      cMix.startNetworkFollower.run = { _ in throw error }
-      return cMix
-    }
-    env.ctx.getE2E = { .unimplemented }
-    let logIn: MessengerLogIn = .live(env)
-
-    XCTAssertThrowsError(try logIn()) { err in
-      XCTAssertEqual(err as? Error, error)
-    }
-  }
-
   func testGetUdContactFromNdfFailure() {
     struct Error: Swift.Error, Equatable {}
     let error = Error()
diff --git a/Tests/XXMessengerClientTests/Messenger/Functors/MessengerRegisterTests.swift b/Tests/XXMessengerClientTests/Messenger/Functors/MessengerRegisterTests.swift
index 8feb8a7c92cca4b79c1976dd35ccb5379861dd4b..82f2527bb2e4779910cb15726bc9b86dc4abe606 100644
--- a/Tests/XXMessengerClientTests/Messenger/Functors/MessengerRegisterTests.swift
+++ b/Tests/XXMessengerClientTests/Messenger/Functors/MessengerRegisterTests.swift
@@ -5,7 +5,6 @@ import XXClient
 
 final class MessengerRegisterTests: XCTestCase {
   func testRegister() throws {
-    var didStartNetworkFollower: [Int] = []
     var didNewOrLoadUDWithParams: [NewOrLoadUd.Params] = []
     var didNewOrLoadUDWithFollower: [UdNetworkStatus] = []
     var didSetUD: [UserDiscovery?] = []
@@ -22,9 +21,6 @@ final class MessengerRegisterTests: XCTestCase {
     env.ctx.getCMix = {
       var cMix: CMix = .unimplemented
       cMix.networkFollowerStatus.run = { networkFollowerStatus }
-      cMix.startNetworkFollower.run = { timeout in
-        didStartNetworkFollower.append(timeout)
-      }
       cMix.getReceptionRegistrationValidationSignature.run = {
         registrationSignature
       }
@@ -50,7 +46,6 @@ final class MessengerRegisterTests: XCTestCase {
     let register: MessengerRegister = .live(env)
     try register(username: username)
 
-    XCTAssertEqual(didStartNetworkFollower, [30_000])
     XCTAssertNoDifference(didNewOrLoadUDWithParams, [.init(
       e2eId: e2eId,
       username: username,
@@ -141,25 +136,6 @@ final class MessengerRegisterTests: XCTestCase {
     }
   }
 
-  func testStartNetworkFollowerFailure() {
-    struct Error: Swift.Error, Equatable {}
-    let error = Error()
-
-    var env: MessengerEnvironment = .unimplemented
-    env.ctx.getCMix = {
-      var cMix: CMix = .unimplemented
-      cMix.networkFollowerStatus.run = { .stopped }
-      cMix.startNetworkFollower.run = { _ in throw error }
-      return cMix
-    }
-    env.ctx.getE2E = { .unimplemented }
-    let register: MessengerRegister = .live(env)
-
-    XCTAssertThrowsError(try register(username: "new-user-name")) { err in
-      XCTAssertEqual(err as? Error, error)
-    }
-  }
-
   func testGetUdContactFromNdfFailure() {
     struct Error: Swift.Error, Equatable {}
     let error = Error()