diff --git a/go.mod b/go.mod
index e72ae36b..cbc9935c 100644
--- a/go.mod
+++ b/go.mod
@@ -3,7 +3,7 @@ module github.com/AdguardTeam/AdGuardHome
 go 1.16
 
 require (
-	github.com/AdguardTeam/dnsproxy v0.37.5
+	github.com/AdguardTeam/dnsproxy v0.37.6
 	github.com/AdguardTeam/golibs v0.8.0
 	github.com/AdguardTeam/urlfilter v0.14.5
 	github.com/NYTimes/gziphandler v1.1.1
diff --git a/go.sum b/go.sum
index 87c9d1a9..78d0d3a3 100644
--- a/go.sum
+++ b/go.sum
@@ -9,8 +9,8 @@ dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod h1:0PRwlb0D
 git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg=
 github.com/AdguardTeam/dhcp v0.0.0-20210519141215-51808c73c0bf h1:gc042VRSIRSUzZ+Px6xQCRWNJZTaPkomisDfUZmoFNk=
 github.com/AdguardTeam/dhcp v0.0.0-20210519141215-51808c73c0bf/go.mod h1:TKl4jN3Voofo4UJIicyNhWGp/nlQqQkFxmwIFTvBkKI=
-github.com/AdguardTeam/dnsproxy v0.37.5 h1:BvMm6LKyuWCQB0ELVRSAwXQ0TdYTqEWe4Ib40SibWbs=
-github.com/AdguardTeam/dnsproxy v0.37.5/go.mod h1:xkJWEuTr550gPDmB9azsciKZzSXjf9wMn+Ji54PQ4gE=
+github.com/AdguardTeam/dnsproxy v0.37.6 h1:qN9KX/fxLIR5TZKtpPHmMx/AUJLAdeXbQ5sjdqHXWW0=
+github.com/AdguardTeam/dnsproxy v0.37.6/go.mod h1:xkJWEuTr550gPDmB9azsciKZzSXjf9wMn+Ji54PQ4gE=
 github.com/AdguardTeam/golibs v0.4.0/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
 github.com/AdguardTeam/golibs v0.4.2/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
 github.com/AdguardTeam/golibs v0.4.4/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
diff --git a/internal/aghtest/upstream.go b/internal/aghtest/upstream.go
index cffdca3a..6ba3cc5e 100644
--- a/internal/aghtest/upstream.go
+++ b/internal/aghtest/upstream.go
@@ -135,6 +135,7 @@ func (u *TestBlockUpstream) Exchange(r *dns.Msg) (*dns.Msg, error) {
 	}
 
 	m := &dns.Msg{}
+	m.SetReply(r)
 	m.Answer = []dns.RR{
 		&dns.TXT{
 			Hdr: dns.RR_Header{
diff --git a/internal/dhcpd/nullbool_test.go b/internal/dhcpd/nullbool_test.go
index 44d1b223..f1f12e47 100644
--- a/internal/dhcpd/nullbool_test.go
+++ b/internal/dhcpd/nullbool_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func TestNullBool_UnmarshalText(t *testing.T) {
+func TestNullBool_UnmarshalJSON(t *testing.T) {
 	testCases := []struct {
 		name       string
 		data       []byte
diff --git a/internal/dhcpd/options.go b/internal/dhcpd/options.go
index 51c3658e..bd3f77a1 100644
--- a/internal/dhcpd/options.go
+++ b/internal/dhcpd/options.go
@@ -130,5 +130,5 @@ func (p *dhcpOptionParser) parse(s string) (code uint8, data []byte, err error)
 		return 0, nil, err
 	}
 
-	return uint8(code), data, nil
+	return code, data, nil
 }