diff --git a/core/dnsserver/register.go b/core/dnsserver/register.go
index 73b63bb70..f289ceaa5 100644
--- a/core/dnsserver/register.go
+++ b/core/dnsserver/register.go
@@ -364,5 +364,3 @@ var (
 	// GracefulTimeout is the maximum duration of a graceful shutdown.
 	GracefulTimeout time.Duration
 )
-
-var _ caddy.GracefulServer = new(Server)
diff --git a/core/dnsserver/server_grpc.go b/core/dnsserver/server_grpc.go
index 369ef0ff6..cbff8c28a 100644
--- a/core/dnsserver/server_grpc.go
+++ b/core/dnsserver/server_grpc.go
@@ -52,8 +52,8 @@ func NewServergRPC(addr string, group []*Config) (*ServergRPC, error) {
 	return &ServergRPC{Server: s, tlsConfig: tlsConfig}, nil
 }
 
-// Compile-time check to ensure Server implements the caddy.GracefulServer interface
-var _ caddy.GracefulServer = &Server{}
+// Compile-time check to ensure ServergRPC implements the caddy.GracefulServer interface
+var _ caddy.GracefulServer = &ServergRPC{}
 
 // Serve implements caddy.TCPServer interface.
 func (s *ServergRPC) Serve(l net.Listener) error {
diff --git a/core/dnsserver/server_https.go b/core/dnsserver/server_https.go
index 09c7d6200..d4cb64be9 100644
--- a/core/dnsserver/server_https.go
+++ b/core/dnsserver/server_https.go
@@ -88,8 +88,8 @@ func NewServerHTTPS(addr string, group []*Config) (*ServerHTTPS, error) {
 	return sh, nil
 }
 
-// Compile-time check to ensure Server implements the caddy.GracefulServer interface
-var _ caddy.GracefulServer = &Server{}
+// Compile-time check to ensure ServerHTTPS implements the caddy.GracefulServer interface
+var _ caddy.GracefulServer = &ServerHTTPS{}
 
 // Serve implements caddy.TCPServer interface.
 func (s *ServerHTTPS) Serve(l net.Listener) error {
diff --git a/core/dnsserver/server_tls.go b/core/dnsserver/server_tls.go
index f2251efb4..4c6faa14c 100644
--- a/core/dnsserver/server_tls.go
+++ b/core/dnsserver/server_tls.go
@@ -39,8 +39,8 @@ func NewServerTLS(addr string, group []*Config) (*ServerTLS, error) {
 	return &ServerTLS{Server: s, tlsConfig: tlsConfig}, nil
 }
 
-// Compile-time check to ensure Server implements the caddy.GracefulServer interface
-var _ caddy.GracefulServer = &Server{}
+// Compile-time check to ensure ServerTLS implements the caddy.GracefulServer interface
+var _ caddy.GracefulServer = &ServerTLS{}
 
 // Serve implements caddy.TCPServer interface.
 func (s *ServerTLS) Serve(l net.Listener) error {