fix(react-query): make sure promises are always finalized

fix(react-query): make sure promises are always finalized #5851