A remote determines an acknowledgement is not received for a command transmitted to a first device, broadcasts a discovery message, receives a response from a second device that received the discovery message and a proximity signal from the remote, and configures itself to control the second device. The remote may also transmit an acknowledgement to the second device. The second device may notify the first device. In various implementations, configuration information in the response may include pairing information and the remote may unpair itself from the first device and pair with the second device. In some implementations, the remote may include a table for controlling devices and the remote may utilize an entry in the table for the second device instead of the first device. In various implementations, the remote may receive responses to the discovery message from multiple devices and may select one to configure itself to control.