diff --git a/programs/pluto/ikev2_ike_intermediate.c b/programs/pluto/ikev2_ike_intermediate.c
index 4f13cebd15..6023acf2da 100644
--- a/programs/pluto/ikev2_ike_intermediate.c
+++ b/programs/pluto/ikev2_ike_intermediate.c
@@ -731,7 +731,12 @@ static const struct v2_transition v2_IKE_INTERMEDIATE_response_transition[] = {
 V2_STATE(IKE_INTERMEDIATE_R,
 	 "sent IKE_INTERMEDIATE response, waiting for IKE_INTERMEDIATE or IKE_AUTH request",
 	 CAT_OPEN_IKE_SA, /*secured*/true,
-	 &v2_IKE_INTERMEDIATE_exchange, &v2_IKE_AUTH_exchange, &v2_IKE_AUTH_EAP_exchange);
+	 &v2_IKE_INTERMEDIATE_exchange,
+	 &v2_IKE_AUTH_exchange,
+#if 0
+	 &v2_IKE_AUTH_EAP_exchange,
+#endif
+	);
 
 V2_EXCHANGE(IKE_INTERMEDIATE, "key IKE SA",
 	    ", initiating IKE_INTERMEDIATE or IKE_AUTH",
diff --git a/programs/pluto/ikev2_ike_sa_init.c b/programs/pluto/ikev2_ike_sa_init.c
index 66614c9211..900c8a29f0 100644
--- a/programs/pluto/ikev2_ike_sa_init.c
+++ b/programs/pluto/ikev2_ike_sa_init.c
@@ -1441,7 +1441,12 @@ V2_STATE(IKE_SA_INIT_I0, "waiting for KE to finish", CAT_IGNORE, /*secured*/fals
 V2_STATE(IKE_SA_INIT_R,
 	 "sent IKE_SA_INIT response, waiting for IKE_INTERMEDIATE or IKE_AUTH request",
 	 CAT_HALF_OPEN_IKE_SA, /*secured*/true,
-	 &v2_IKE_AUTH_exchange, &v2_IKE_INTERMEDIATE_exchange, &v2_IKE_AUTH_EAP_exchange);
+	 &v2_IKE_AUTH_exchange,
+	 &v2_IKE_INTERMEDIATE_exchange,
+#if 0
+	 &v2_IKE_AUTH_EAP_exchange,
+#endif
+	);
 
 V2_EXCHANGE(IKE_SA_INIT, "initiate IKE SA",
 	    ", preparing IKE_INTERMEDIATE or IKE_AUTH request",