The Civil Aviation Authority has critiqued Air New Zealand's surfing safety video.
The video, which was first screened last May, is set at Raglan and features some of the world's top surfers.
In an email obtained by TVNZ, the CAA said that the video was acceptable for use, but diverged from the safety message.
"As we have commented previously, the video diverges materially from the 'safety message' at times, and whilst I appreciate the need to engage the viewers, the extraneous material detracts from the scope and direction of the safety message."
The email refers Air New Zealand to the Authority's literature on cabin briefings, suggesting it could be of assistance.
The airline said that it was extending "its creative licence" with its inflight safety videos last month.
With the release of its Safety in Hollywood video, global brand, Jodi Williams, said the company was continually trying to achieve "cut through" while still fulfilling the education role for passengers.
"The challenge is how to continue to make them entertaining, how do you continue to attract people and new ideas," she said.
Safety in Hollywood was filmed at four different sets over two days with some of the filming locations seen in movies such as Jurassic Park, Casablanca, Singing in the Rain, War of the Worlds and TV series True Blood.
Air NZ safety videos
Nothing to Hide, June 2009
All Blacks, 2010
Richard Simmons, March 2011
Best of the Best, November 2011
Sketch, June 2012
Hobbit Film 1, November 2012
Bear Grylls, February 2013
Betty White, October 2013
Sports Illustrated, February 2014
Hobbit Film 2, October 2014
Surfing Safari, May 2015.
Men in Black, August 2015
Safety in Hollywood, July this year.