diff --git a/src/ap/wpa_auth.c b/src/ap/wpa_auth.c
index 07844e436..68a868a00 100644
--- a/src/ap/wpa_auth.c
+++ b/src/ap/wpa_auth.c
@@ -4713,9 +4713,9 @@ SM_STATE(WPA_PTK, PTKINITNEGOTIATING)
 		wpa_ie_len = pos - wpa_ie_buf3;
 		wpa_hexdump(MSG_DEBUG, "EAPOL-Key msg 3/4 IEs after edits",
 			    wpa_ie, wpa_ie_len);
-	}
-	if ((conf->rsn_override_key_mgmt || conf->rsn_override_key_mgmt_2) &&
-	    !sm->rsn_override && !sm->rsn_override_2) {
+	} else if ((conf->rsn_override_key_mgmt ||
+		    conf->rsn_override_key_mgmt_2) &&
+		   !sm->rsn_override && !sm->rsn_override_2) {
 		u8 *ie;
 		size_t ie_len;
 		u32 ids[] = {