diff --git a/src/knot/events/handlers/update.c b/src/knot/events/handlers/update.c
index 2b17375b0be04887c7187d6e4bcbebdc2bb84ed7..f4d13e68651e09a7a1d332a8e668ab25af72cbd4 100644
--- a/src/knot/events/handlers/update.c
+++ b/src/knot/events/handlers/update.c
@@ -113,7 +113,6 @@ static int process_bulk(zone_t *zone, list_t *requests, zone_update_t *up)
 		init_qdata_from_request(&qdata, zone, req, &params, &extra);
 
 		store_original_qname(&qdata, req->query);
-		process_query_qname_case_lower(req->query);
 
 		int ret = check_prereqs(req, zone, up, &qdata);
 		if (ret != KNOT_EOK) {
@@ -125,8 +124,6 @@ static int process_bulk(zone_t *zone, list_t *requests, zone_update_t *up)
 		if (ret != KNOT_EOK) {
 			return ret;
 		}
-
-		process_query_qname_case_restore(req->query, &qdata);
 	}
 
 	return KNOT_EOK;
diff --git a/src/knot/nameserver/process_query.c b/src/knot/nameserver/process_query.c
index 85256c743603b54c61c0f702505978ee6fec3c76..87d7cc1873753522d33129b7379d23a659e8bfa4 100644
--- a/src/knot/nameserver/process_query.c
+++ b/src/knot/nameserver/process_query.c
@@ -429,12 +429,6 @@ static int prepare_answer(knot_pkt_t *query, knot_pkt_t *resp, knot_layer_t *ctx
 		return KNOT_ENOTSUP;
 	}
 
-	/* Convert query QNAME to lowercase, but keep original QNAME case.
-	 * Already checked for absence of compression and length.
-	 */
-	memcpy(qdata->extra->orig_qname, qname, query->qname_size);
-	process_query_qname_case_lower(query);
-
 	/* Find zone for QNAME. */
 	qdata->extra->zone = answer_zone_find(query, server->zone_db);
 	if (qdata->extra->zone != NULL && qdata->extra->contents == NULL) {
@@ -488,9 +482,6 @@ static int process_query_err(knot_layer_t *ctx, knot_pkt_t *pkt)
 		knot_wire_set_tc(pkt->wire);
 	}
 
-	/* Restore original QNAME. */
-	process_query_qname_case_restore(pkt, qdata);
-
 	/* Move to Additionals to add OPT and TSIG. */
 	if (pkt->current != KNOT_ADDITIONAL) {
 		(void)knot_pkt_begin(pkt, KNOT_ADDITIONAL);
@@ -591,9 +582,6 @@ static int process_query_out(knot_layer_t *ctx, knot_pkt_t *pkt)
 
 	/* Postprocessing. */
 	if (next_state == KNOT_STATE_DONE || next_state == KNOT_STATE_PRODUCE) {
-		/* Restore original QNAME. */
-		process_query_qname_case_restore(pkt, qdata);
-
 		/* Move to Additionals to add OPT and TSIG. */
 		if (pkt->current != KNOT_ADDITIONAL) {
 			(void)knot_pkt_begin(pkt, KNOT_ADDITIONAL);
@@ -709,10 +697,8 @@ int process_query_verify(knotd_qdata_t *qdata)
 	ctx->tsig_digestlen = knot_tsig_rdata_mac_length(query->tsig_rr);
 
 	/* Checking query. */
-	process_query_qname_case_restore(query, qdata);
 	int ret = knot_tsig_server_check(query->tsig_rr, query->wire,
 	                                 query->size, &ctx->tsig_key);
-	process_query_qname_case_lower(query);
 
 	/* Evaluate TSIG check results. */
 	switch(ret) {
diff --git a/src/knot/nameserver/process_query.h b/src/knot/nameserver/process_query.h
index 00e1790c03361a51191a398086b3dc6ce1df0aa8..cd1e3382493556b7ed6b4f41bc134127723ed76a 100644
--- a/src/knot/nameserver/process_query.h
+++ b/src/knot/nameserver/process_query.h
@@ -92,31 +92,6 @@ int process_query_verify(knotd_qdata_t *qdata);
  */
 int process_query_sign_response(knot_pkt_t *pkt, knotd_qdata_t *qdata);
 
-/*!
- * \brief Restore QNAME letter case.
- *
- * \param pkt    Incoming message.
- * \param qdata  Query data.
- */
-static inline void process_query_qname_case_restore(knot_pkt_t *pkt, knotd_qdata_t *qdata)
-{
-	// If original QNAME is empty, query is either unparsed or for root domain.
-	if (qdata->extra->orig_qname[0] != '\0') {
-		memcpy(pkt->wire + KNOT_WIRE_HEADER_SIZE,
-		       qdata->extra->orig_qname, qdata->query->qname_size);
-	}
-}
-
-/*!
- * \brief Convert QNAME to lowercase format for processing.
- *
- * \param pkt    Incoming message.
- */
-static inline void process_query_qname_case_lower(knot_pkt_t *pkt)
-{
-	knot_dname_to_lower(knot_pkt_qname(pkt));
-}
-
 /*!
  * \brief Puts RRSet to packet, will store its RRSIG for later use.
  *
diff --git a/src/knot/nameserver/update.c b/src/knot/nameserver/update.c
index 21245f77c93b9a82c5fd1a1c8ba6b9646501af04..f43e1afc4c5139dac77de47a7b1db17df95ffad1 100644
--- a/src/knot/nameserver/update.c
+++ b/src/knot/nameserver/update.c
@@ -96,8 +96,6 @@ int update_process_query(knot_pkt_t *pkt, knotd_qdata_t *qdata)
 	/* Check frozen zone. */
 	NS_NEED_NOT_FROZEN(qdata);
 
-	/* Restore original QNAME for DDNS ACL checks. */
-	process_query_qname_case_restore(qdata->query, qdata);
 	/* Store update into DDNS queue. */
 	int ret = update_enqueue((zone_t *)qdata->extra->zone, qdata);
 	if (ret != KNOT_EOK) {