Fix deadlock with 5.4.2 some sniffs