As the war in the Pacific drew to a close, "Greenlet" departed Guam for Japan on 16 August 1945. She reached Sagami Wan, Honshū, on 28 August; entered Tokyo Bay the following day; and was present during the signing of the Japanese surrender on 2 September. After placing buoys over wrecks in the harbor and channel at Tokyo, she stripped and demilitarized Japanese miniature submarines based in Yokosuka harbor. On 1 November she escorted three Japanese fleet submarines to Sasebo and converted them for American crews. Departing Sasebo on 11 December, she escorted former Japanese submarines "1-1.4", , and to Pearl Harbor, where she arrived via Guam and Eniwetok on 6 January 1946.