diff --git a/src/netdev.c b/src/netdev.c
index a77f683d..c3138675 100644
--- a/src/netdev.c
+++ b/src/netdev.c
@@ -240,6 +240,8 @@ struct netdev *netdev_find(int ifindex)
 
 static void netdev_lost_beacon(struct netdev *netdev)
 {
+	eapol_cancel(netdev->index);
+
 	if (!netdev->event_filter)
 		return;
 
@@ -354,6 +356,8 @@ static void netdev_disconnect_event(struct l_genl_msg *msg,
 	if (!disconnect_by_ap)
 		return;
 
+	eapol_cancel(netdev->index);
+
 	if (netdev->event_filter)
 		netdev->event_filter(netdev, NETDEV_EVENT_DISCONNECT_BY_AP,
 							netdev->user_data);