PSG had originally been drawn to face Manchester United - which would have seen an eye-catching showdown between Messi and Cristiano Ronaldo - but UEFA decreed that a "material error" had occurred due to a "technical problem with the software of an external service provider", rendering the draw null and void.

After the redraw, Manchester United will head to Spain's capital to face Atletico Madrid, while fellow Spanish side Villarreal will take on Italy's Juventus.

Title holders Chelsea received the same opponents in both draws, as they will take on reigning French Ligue 1 champions Lille.

German champions Bayern Munich will take on surprise package RB Salzburg of Austria, and Pepe Guardiola's Manchester City will face Sporting Lisbon.

The other two ties will see Inter Milan face Liverpool and Benfica take on Ajax. — Agencies