The Pinola was assigned to the Pacific Fleet and operated on the West Coast near San Francisco until decommissioning at Mare Island on 9 June 1922. The ship was recommissioned on 14 August 1923 and resumed service in ports of the California coast, principally San Diego where she served during the years between the wars.
After Japan's attack on Pearl Harbor brought the United States into World War II, Pinola continued operations on the West Coast through most of the war providing tug services to the Navy's fighting ships in the Pacific. The ship was redesignated ATO–30 on 15 May 1944 and served in Alaskan waters during the closing months of the war.