KN-5928 Get rid of redundant requests on server