On 19 March 1945, "Shelter" departed Ulithi with Mine Group 2 for exploratory sweeps in the Kerama Retto area, and the western side of Okinawa, from 26 March until the initial invasion landings on 1 April. Division 36 also, on D-Day minus one, destroyed mines at the landing site with gunfire, being too shallow to sweep. She made assault sweeps at Ie Shima on 8 and 14 April, served on antisubmarine patrol, and departed on 4 May for Ulithi, thence to San Pedro Bay, Leyte, Philippine Islands. Lieutenant Lancaster then assumed command. Here, she joined a convoy which reached Okinawa on the 29th. The following three weeks were largely taken up with sweeping of minefields off Myako Jima in the East China Sea. She stood out of Kerama Retto on 8 July 1945 as escort unit for LST Group 45 which entered San Pedro Bay on 13 July, and departed Leyte Gulf on 19 August with a convoy that reached Okinawa on the 24th. Six days later, she sailed with a minesweeping task unit that swept the Arcadia minefields in the Yellow Sea in preparation for the landing of occupation forces on the Korean peninsula by the Ninth Fleet on 7 September 1945. She then proceeded to the western coast of Kyushu, Japan, for minesweeping in approaches to Nagasaki and Sasebo, where Lieutenant Douglas Giddings assumed command, clearing 22 moored mines and obstructions from 9 to 16 September 1945.