The Department of Conservation says 18 whales stranded at Farewell Spit in Golden Bay have been refloated and appear to be out of danger.
Twenty-five whales became stranded on Friday night and seven of them died.
DoC's Golden Bay area manager John Mason says the whales were heading back into shallow water, after being refloated on Saturday morning.
But he says the whales then headed to safer waters.
Mr Mason says DoC will continue to monitor the whales movements on Saturday night, and at this stage they're confident they won't restrand.