diff --git a/doc/Changelog b/doc/Changelog
index a6249cce0..e97fb5104 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,6 +1,8 @@
 27 September 2016: Wouter
 	- tag for 1.5.10 release
 	- trunk contains 1.5.11 in development.
+	- Fix dnstap relaying "random" messages instead of resolver/forwarder
+	  responses, from Nikolay Edigaryev.
 
 20 September 2016: Wouter
 	- iana portlist update.
diff --git a/services/outside_network.c b/services/outside_network.c
index dd25ab39b..6aaa7962f 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -1879,7 +1879,7 @@ serviced_udp_callback(struct comm_point* c, void* arg, int error,
 		return 0;
 	}
 #ifdef USE_DNSTAP
-	if(outnet->dtenv &&
+	if(error == NETEVENT_NOERROR && outnet->dtenv &&
 	   (outnet->dtenv->log_resolver_response_messages ||
 	    outnet->dtenv->log_forwarder_response_messages))
 		dt_msg_send_outside_response(outnet->dtenv, &sq->addr, c->type,