Switching to another item immediately after using Riptide causes it to be held strangely

Items are not meant to be held in this position (at the top of the screen). It'd be expected that either the held item immediately appear at its normal position, or preferably (to stop possible discrepancies between held items in third person), for item switching to be blocked until the animation is done.