fix(core): Fix client hook edge cases around multiple callbacks

fix(core): Fix client hook edge cases around multiple callbacks #8356