When an access point associates with an electronic device, the access point may establish secure communication with the electronic device using a four-way handshake with the electronic device. Next, the access point may distribute secondary pairwise master keys (PMKs) to radio-frequency (RF)-neighbor access points of the access point in a wireless local area network, where the secondary PMKs facilitate fast basic service set (BSS) transitions with the electronic device when a handover occurs without using the four-way handshake to establish secure communication with the electronic device. Furthermore, when the access point receives information that indicates that the electronic device has associated with a second access point in the RF-neighbor access points of the access point, the access point provides instructions to delete the secondary PMKs at the RF-neighbor access points of the access point, and provides additional secondary PMKs to RF-neighbor access points of the second access point.