diff --git a/management/server/http/testing/testing_tools/tools.go b/management/server/http/testing/testing_tools/tools.go
index d84a28ed5..6a7b11243 100644
--- a/management/server/http/testing/testing_tools/tools.go
+++ b/management/server/http/testing/testing_tools/tools.go
@@ -118,7 +118,7 @@ func BuildApiBlackBoxWithDBState(t TB, sqlFile string, expectedPeerUpdate *serve
 		t.Fatalf("Failed to create metrics: %v", err)
 	}
 
-	peersUpdateManager := server.NewPeersUpdateManager(nil)
+	peersUpdateManager := server.NewPeersUpdateManager(metrics)
 	updMsg := peersUpdateManager.CreateChannel(context.Background(), TestPeerId)
 	done := make(chan struct{})
 	if validateUpdate {
diff --git a/management/server/peer.go b/management/server/peer.go
index 8412842c0..989a3b7ae 100644
--- a/management/server/peer.go
+++ b/management/server/peer.go
@@ -906,6 +906,9 @@ func (am *DefaultAccountManager) LoginPeer(ctx context.Context, login types.Peer
 
 		if updateRemotePeers || isStatusChanged || (isPeerUpdated && len(postureChecks) > 0) {
 			err = transaction.IncrementNetworkSerial(ctx, store.LockingStrengthUpdate, accountID)
+			if err != nil {
+				return fmt.Errorf("failed to increment network serial: %w", err)
+			}
 		}
 
 		return nil
diff --git a/management/server/updatechannel.go b/management/server/updatechannel.go
index 6bd1c6422..6a8095460 100644
--- a/management/server/updatechannel.go
+++ b/management/server/updatechannel.go
@@ -12,8 +12,6 @@ import (
 	"github.com/netbirdio/netbird/management/server/types"
 )
 
-const channelBufferSize = 2
-
 type UpdateMessage struct {
 	Update     *proto.SyncResponse
 	NetworkMap *types.NetworkMap