diff --git a/src/eap_server/eap_aka_prime.c b/src/eap_server/eap_aka_prime.c
index 156308699..4627a9406 100644
--- a/src/eap_server/eap_aka_prime.c
+++ b/src/eap_server/eap_aka_prime.c
@@ -761,6 +761,9 @@ static void eap_aka_process_challenge(struct eap_sm *sm,
 
 	wpa_printf(MSG_DEBUG, "EAP-AKA: Processing Challenge");
 
+#if 0
+	/* KDF negotiation; to be enabled only after more than one KDF is
+	 * supported */
 	if (data->eap_method == EAP_TYPE_AKA_PRIME &&
 	    attr->kdf_count == 1 && attr->mac == NULL) {
 		if (attr->kdf[0] != EAP_AKA_PRIME_KDF) {
@@ -779,6 +782,7 @@ static void eap_aka_process_challenge(struct eap_sm *sm,
 		wpa_printf(MSG_DEBUG, "EAP-AKA': KDF %d selected", data->kdf);
 		return;
 	}
+#endif
 
 	if (attr->checkcode &&
 	    eap_aka_verify_checkcode(data, attr->checkcode,