Upon arrival at Kerama Retto on 26 March 1945, "Riddle" operated with various screening units, patrol sections, and retirement groups in those waters. 12 April found the vessel off Okinawa on a patrolling station, with task force TF 51, under enemy attack. Two Japanese kamikazes attacked "Riddle". The first was shot down, just clearing the ship, and the second crashed into the ship killing one man and causing considerable damage. After transfer of wounded and repair to her battle damage at Kerama Retto, "Riddle" got underway on 16 April as an escort to Saipan.