Barcelona coach Xavi will remain at the club until at least the end of his contract in June 2025 after changing his mind that this would be his last season.