Fix events being re-registered when staying on the same connection/stage