diff --git a/src/libcharon/sa/ikev2/tasks/ike_config.c b/src/libcharon/sa/ikev2/tasks/ike_config.c
index fdccda5f5..3fb4b9446 100644
--- a/src/libcharon/sa/ikev2/tasks/ike_config.c
+++ b/src/libcharon/sa/ikev2/tasks/ike_config.c
@@ -317,6 +317,10 @@ METHOD(task_t, build_i, status_t,
 		{
 			message->add_payload(message, (payload_t*)cp);
 		}
+		else
+		{	/* we don't expect a CFG_REPLY */
+			return SUCCESS;
+		}
 	}
 	return NEED_MORE;
 }