Drowning is the leading cause of death for visitors in Hawaii, according to the State Department of Health.
State lawmakers say there's more that can be done to prevent it from happening.
A bill at the State Capitol would modify the Good Samaritan law that's already in place.
The bill applies to rescue tubes, AEDs or defibrillators that are already along some of the state's beaches.
They're put there by volunteers. However, lawmakers say there's concern about volunteers being sued if something were to go wrong while a Good Samaritan were to use those devices.
The bill would waive liabilities for people who put rescue tubes or AEDs along their beachfront properties.
"If you own a property by the water and you notice that there are people engaging in unsafe activity in that water and you want to voluntarily offer the use of this rescue device to rescue people who are in trouble in the water, this would immunize you from liability whenever someone is using this device to rescue someone in the water," Sen. Stanley Chang said.
Chang says rescue tubes have been particularly successful in helping save lives on both Kauai and Maui.
The bill awaits a third reading.