diff --git a/src/eapol.c b/src/eapol.c
index e30ea09c..c3ece5bc 100644
--- a/src/eapol.c
+++ b/src/eapol.c
@@ -1063,8 +1063,8 @@ static void eapol_handle_ptk_1_of_4(struct eapol_sm *sm,
 	eapol_write(sm, (struct eapol_frame *) step2);
 	l_free(step2);
 
-	l_timeout_remove(sm->timeout);
-	sm->timeout = NULL;
+	l_timeout_remove(sm->eapol_start_timeout);
+	sm->eapol_start_timeout = NULL;
 
 	return;
 
@@ -1346,6 +1346,9 @@ retransmit:
 		rekey_offload(sm->handshake->ifindex, ptk->kek, ptk->kck,
 				sm->replay_counter, sm->user_data);
 
+	l_timeout_remove(sm->timeout);
+	sm->timeout = NULL;
+
 	return;
 
 error_ie_different: