A southern right whale that found itself in shallow waters off Mt Maunganui is now swimming free - but boaties are still being warned to steer clear.
The Department of Conservation (DoC) said it was called to a possible whale stranding off Moturiki Island in Mt Maunganui.
The whale found itself in shallow water near the island, also known as Leisure Island.
DoC partnership manager Margaret Metcalfe said it was not stranded but could easily get into trouble.
Whale rescue group Project Jonah, which is working with DoC, said the whale had moved in to deeper waters and was "free swimming" shortly after 5pm.
"We will continue to monitor the situation with DoC, but would like to remind everyone that this is a rare species of whale and we don't want to cause it any further stress.