Fixing leave causing incorrect stream forwarding state