diff --git a/doc/Changelog b/doc/Changelog
index faae871b2..73e2d3cfa 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+17 January 2018: Wouter
+	- For caps-for-id fallback, use the whitelist to avoid timeout
+	  starting a fallback sequence for it.
+
 16 January 2018: Ralph
 	- Get ready for the DNS flag day: remove EDNS lame procedure, do not
 	  re-query without EDNS after timeout.
diff --git a/iterator/iterator.c b/iterator/iterator.c
index f66381b40..7a62e1281 100644
--- a/iterator/iterator.c
+++ b/iterator/iterator.c
@@ -3571,7 +3571,7 @@ process_response(struct module_qstate* qstate, struct iter_qstate* iq,
 	if(event == module_event_noreply || event == module_event_error) {
 		if(event == module_event_noreply && iq->sent_count >= 3 &&
 			qstate->env->cfg->use_caps_bits_for_id &&
-			!iq->caps_fallback) {
+			!iq->caps_fallback && !is_caps_whitelisted(ie, iq)) {
 			/* start fallback */
 			iq->caps_fallback = 1;
 			iq->caps_server = 0;