fix: client merging concurrent calls that shouldn't be merged

fix: client merging concurrent calls that shouldn't be merged #3736