diff --git a/src/eapol.c b/src/eapol.c
index cb55129b..722e04b1 100644
--- a/src/eapol.c
+++ b/src/eapol.c
@@ -754,7 +754,9 @@ struct eapol_sm *eapol_sm_new(struct handshake_state *hs)
 	sm = l_new(struct eapol_sm, 1);
 
 	sm->handshake = hs;
-	sm->use_eapol_start = true;
+
+	if (hs->settings_8021x)
+		sm->use_eapol_start = true;
 
 	return sm;
 }