With the 33-year-old having been reintegrated back into the squad, the club legend will feature in his regular spot on the right-hand side under Ronald Koeman.
However, Messi has been left with a difficult to choice to make next month after the scheduling of Argentina's next two World Cup qualifiers.
While the second of those takes place 12 days before the first El Clasico of the season against Real Madrid, current regulations require two weeks of isolation after travel between various countries.
Given that the 2022 World Cup will realistically be his last, the forward is expected to want to ensure that his national team make the finals in Qatar.
Should he travel back to his homeland, Messi would also be absent from fixtures against Getafe and Alaves.