diff --git a/doc/Changelog b/doc/Changelog
index 7cd7f1295..b890c8c8f 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+18 September 2017: Ralph
+	- Fix #1400: allowing use of global cache on ECS-forwarding unless
+	  always-forward.
+
 18 September 2017: Wouter
 	- tag 1.6.6 (is 1.6.6rc2)
 	- Fix that looping modules always stop the query, and don't pass
diff --git a/edns-subnet/subnetmod.c b/edns-subnet/subnetmod.c
index c906e4e53..4b8a4b211 100644
--- a/edns-subnet/subnetmod.c
+++ b/edns-subnet/subnetmod.c
@@ -722,6 +722,7 @@ subnetmod_operate(struct module_qstate *qstate, enum module_ev event,
 		sq->ecs_server_out.subnet_scope_mask = 0;
 		sq->ecs_server_out.subnet_validdata = 1;
 		if(sq->ecs_server_out.subnet_source_mask != 0 &&
+			qstate->env->cfg->client_subnet_always_forward &&
 			sq->subnet_downstream)
 			/* ECS specific data required, do not look at the global
 			 * cache in other modules. */