diff --git a/dnsforward/dnsforward.go b/dnsforward/dnsforward.go
index d2acb049..daa79efe 100644
--- a/dnsforward/dnsforward.go
+++ b/dnsforward/dnsforward.go
@@ -432,7 +432,6 @@ func (s *Server) handleDNSRequest(p *proxy.Proxy, d *proxy.DNSContext) error {
 
 		if res.Reason == dnsfilter.ReasonRewrite && len(res.CanonName) != 0 {
 			d.Req.Question[0] = originalQuestion
-			d.Res.Question[0] = originalQuestion
 
 			if len(d.Res.Answer) != 0 {
 				answer = append(answer, d.Res.Answer...) // host -> IP
@@ -441,6 +440,10 @@ func (s *Server) handleDNSRequest(p *proxy.Proxy, d *proxy.DNSContext) error {
 		}
 	}
 
+	if d.Res != nil {
+		d.Res.Compress = true // some devices require DNS message compression
+	}
+
 	shouldLog := true
 	msg := d.Req