diff --git a/src/mdns.c b/src/mdns.c
index 28de951f..56ce7013 100644
--- a/src/mdns.c
+++ b/src/mdns.c
@@ -1746,7 +1746,7 @@ mdns_udp_read_cb(void *userarg)
 	if (read < GLDNS_HEADER_SIZE)
 		return; /* Not DNS */
 
-	if (GLDNS_ID_WIRE(netreq->response) != netreq->query_id)
+	if (GLDNS_ID_WIRE(netreq->response) != GLDNS_ID_WIRE(netreq->query))
 		return; /* Cache poisoning attempt ;) */
 
 	// TODO: check whether EDNS server cookies are required for MDNS
@@ -1788,8 +1788,7 @@ mdns_udp_write_cb(void *userarg)
 
 	netreq->debug_start_time = _getdns_get_time_as_uintt64();
 	netreq->debug_udp = 1;
-	netreq->query_id = (uint16_t) arc4random();
-	GLDNS_ID_SET(netreq->query, netreq->query_id);
+	GLDNS_ID_SET(netreq->query, (uint16_t) arc4random());
 
 	/* do we need to handle options valid in the MDNS context? */
 
diff --git a/src/request-internal.c b/src/request-internal.c
index d91563f4..15f97179 100644
--- a/src/request-internal.c
+++ b/src/request-internal.c
@@ -125,7 +125,6 @@ netreq_reset(getdns_network_req *net_req)
 	_getdns_netreq_change_state(net_req, NET_REQ_NOT_SENT);
 	net_req->dnssec_status = GETDNS_DNSSEC_INDETERMINATE;
 	net_req->tsig_status = GETDNS_DNSSEC_INDETERMINATE;
-	net_req->query_id = 0;
 	net_req->response_len = 0;
 	/* Some fields to record info for return_call_reporting */
 	net_req->debug_start_time = 0;
diff --git a/src/stub.c b/src/stub.c
index 564a3415..f900d35c 100644
--- a/src/stub.c
+++ b/src/stub.c
@@ -505,7 +505,6 @@ stub_cleanup(getdns_network_req *netreq)
 	getdns_dns_req *dnsreq = netreq->owner;
 	getdns_network_req *r, *prev_r;
 	getdns_upstream *upstream;
-	intptr_t query_id_intptr;
 
 	GETDNS_CLEAR_EVENT(dnsreq->loop, &netreq->event);
 
@@ -514,9 +513,8 @@ stub_cleanup(getdns_network_req *netreq)
 		return;
 
 	/* Delete from upstream->netreq_by_query_id (if present) */
-	query_id_intptr = (intptr_t)netreq->query_id;
-	(void) _getdns_rbtree_delete(
-	    &upstream->netreq_by_query_id, (void *)query_id_intptr);
+	(void) _getdns_rbtree_delete(&upstream->netreq_by_query_id,
+	    (void *)(intptr_t)GLDNS_ID_WIRE(netreq->query));
 
 	/* Delete from upstream->write_queue (if present) */
 	for (prev_r = NULL, r = upstream->write_queue; r;
@@ -778,7 +776,6 @@ stub_tcp_write(int fd, getdns_tcp_state *tcp, getdns_network_req *netreq)
 		} while (!_getdns_rbtree_insert(
 		    &netreq->upstream->netreq_by_query_id, &netreq->node));
 
-		netreq->query_id = query_id;
 		GLDNS_ID_SET(netreq->query, query_id);
 
 		if (netreq->opt) {
@@ -1280,7 +1277,6 @@ stub_tls_write(getdns_upstream *upstream, getdns_tcp_state *tcp,
 		} while (!_getdns_rbtree_insert(
 		    &netreq->upstream->netreq_by_query_id, &netreq->node));
 
-		netreq->query_id = query_id;
 		GLDNS_ID_SET(netreq->query, query_id);
 
 		/* TODO: Review if more EDNS0 handling can be centralised.*/
@@ -1430,7 +1426,7 @@ stub_udp_read_cb(void *userarg)
 	if (read < GLDNS_HEADER_SIZE)
 		return; /* Not DNS */
 	
-	if (GLDNS_ID_WIRE(netreq->response) != netreq->query_id)
+	if (GLDNS_ID_WIRE(netreq->response) != GLDNS_ID_WIRE(netreq->query))
 		return; /* Cache poisoning attempt ;) */
 
 	if (netreq->owner->edns_cookies && match_and_process_server_cookie(
@@ -1502,8 +1498,7 @@ stub_udp_write_cb(void *userarg)
 
 	netreq->debug_start_time = _getdns_get_time_as_uintt64();
 	netreq->debug_udp = 1;
-	netreq->query_id = arc4random();
-	GLDNS_ID_SET(netreq->query, netreq->query_id);
+	GLDNS_ID_SET(netreq->query, (uint16_t)arc4random());
 	if (netreq->opt) {
 		_getdns_network_req_clear_upstream_options(netreq);
 		if (netreq->edns_maximum_udp_payload_size == -1)
@@ -1731,8 +1726,8 @@ upstream_write_cb(void *userarg)
 		/* Could not complete the set up. Need to fallback.*/
 		DEBUG_STUB("%s %-35s: Upstream: %p ERROR = %d\n", STUB_DEBUG_WRITE,
 		             __FUNC__, (void*)userarg, q);
-		(void) _getdns_rbtree_delete(
-		    &upstream->netreq_by_query_id, (void *)(intptr_t)netreq->query_id);
+		(void) _getdns_rbtree_delete(&upstream->netreq_by_query_id,
+		    (void *)(intptr_t)GLDNS_ID_WIRE(netreq->query));
 		upstream_failed(upstream, (q == STUB_TCP_ERROR ? 0:1));
 		/* Fall through */
 	case STUB_CONN_GONE:
diff --git a/src/types-internal.h b/src/types-internal.h
index 22cf649a..7834fc32 100644
--- a/src/types-internal.h
+++ b/src/types-internal.h
@@ -226,7 +226,6 @@ typedef struct getdns_network_req
 	size_t                  transport_current;
 	getdns_tls_authentication_t  tls_auth_min;
 	getdns_eventloop_event  event;
-	uint16_t                query_id;
 
 	int                     edns_maximum_udp_payload_size;
 	uint16_t                max_udp_payload_size;