[DF-2734] Fix entity jumping after clone