For the next seven years, Beaver remained in Hawaiian waters, tending submarines during local operations and steaming occasionally to Wake Island, Midway, and French Frigate Shoals for deployment exercises. The tender also participated in every fleet exercise held in Hawaiian waters during the 1930s. She missed the last fleet problem in 1940, however, as the tender was in San Diego during February for a major overhaul. Intended to improve her capability to support submarines overseas, "Beaver"s modernization also included the installation of new repair equipment and the latest communications gear.