Do we still need to set a default stream id if we get a null?