Enlarge (credit: Apple)

If you’ve ever sent an iPhone in for repair, you might be familiar with the dance Apple asks you to do if your device still powers on: back up your data, then either erase the phone or disable the Find My feature so your phone can easily be serviced (or, if it’s being exchanged for a new one, refurbished and resold). If you’re also using the Stolen Device Protection and Security Delay feature introduced in iOS 17.3, this can be a pain, since you need to wait a full hour to turn Find My off after you make the request.

It looks like Apple is making some changes to that process in iOS 17.5, which is currently in beta testing. The update adds a new “repair state” mode that leaves the device functional while keeping both Find My and Activation Lock enabled. This means that iPhones swiped while in transit will still be trackable and that they’ll still stay locked to your Apple ID so they can’t easily be wiped and resold.

MacRumors has a good overview of the feature as it currently functions. You can set an iPhone to repair state mode by pulling it up in the Find My app and attempting to remove the device from your account while it’s still online and active. Rather than removing the device from your account, the app will offer to put it in the repair state instead; unlike when you try to disable Find My entirely, this doesn’t trigger the one-hour Security Delay waiting period. If your phone is offline, Find My will offer to remove it from your account, as it currently does.