Amazon and Google are partnering with the law enforcement community to protect the public interest. The news comes at a time when law enforcement needs end-to-end encryption

Ring, the Amazon-owned home surveillance company known for its long history of partnering with police, announced today that it plans to shut down a controversial tool that allows law enforcement to ask users to share their footage without first obtaining a warrant.

This change might seem like a step in the right direction, but it may actually make the clips request process less transparent as police can still request clips from Ring during what they consider emergencies. In a statement to The Verge, Amazon spokesperson Yassi Yarger confirmed that on “rare occasions,” Ring will provide information to law enforcement “when there is an imminent danger of death or serious physical injury, such as a kidnapping or an attempted murder.”

Yarger adds that the “emergency requests are reviewed by trained professionals who disclose information only when that legal standard is met.” Police have the ability to get footage in an emergency without a warrant. Google will also show footage from Nest devices to police in emergencies, no warrant required.

The shutdown of the RFA tool was a move in the right direction, but it did not sit well with Matthew Guariglia, a senior policy analyst at the Electronic Frontier Foundation. He added that Ring could help protect the rights of their community members if they enabled end-to-end encryption by default.

The relationship between Ring and the law enforcement community has come under fire because of the police partnership program. For years, Ring worked with police to sell discounted devices, some of which were subsidized with taxpayer funds, and frequently pressured police departments to follow company talking points.