diff --git a/doc/Changelog b/doc/Changelog
index 20dc5ad1c..8664b2172 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+8 April 2015: Wouter
+	- Fix crash in dnstap: Do not try to log TCP responses after timeout.
+
 7 April 2015: Wouter
 	- Libunbound skips dos-line-endings from etc/hosts.
 	- Unbound exits with a fatal error when the auto-trust-anchor-file
diff --git a/services/outside_network.c b/services/outside_network.c
index dc3d2f404..8d6760737 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -1590,7 +1590,7 @@ serviced_tcp_callback(struct comm_point* c, void* arg, int error,
 		infra_update_tcp_works(sq->outnet->infra, &sq->addr,
 			sq->addrlen, sq->zone, sq->zonelen);
 #ifdef USE_DNSTAP
-	if(sq->outnet->dtenv &&
+	if(error==NETEVENT_NOERROR && sq->outnet->dtenv &&
 	   (sq->outnet->dtenv->log_resolver_response_messages ||
 	    sq->outnet->dtenv->log_forwarder_response_messages))
 		dt_msg_send_outside_response(sq->outnet->dtenv, &sq->addr,