Remove awaitUninterruptibly() in listener (can cause a deadlock)