Madonna's concert in Poland will open with a video about the Warsaw Uprising out of respect to war veterans.
Organisers of the singer's MDNA world tour have agreed to a request from city officials to start the show in the Polish capital with a brief clip about the the 1944 revolt against Nazi rule.
Some veterans and young Catholics have voiced anger that the August 1 concert falls on the 68th anniversary of the uprising - a day traditionally marked with a sombre tone.
The city-wide attack ended in the deaths of thousands of Poles and the destruction of the city.
City officials proposed airing a clip about the revolt to allay the veterans' feelings.
Ania Pietrzak, a spokeswoman for concert organiser Live Nation, said "it is an important moment in Polish history, so we have decided to remind people of that moment."
Madonna's world tour has been surrounded by controversy, and she has brandished guns on stage and exposed herself during some shows.