diff --git a/cmd/devp2p/dnscmd.go b/cmd/devp2p/dnscmd.go
index 21714b77a3..74d70d3aaa 100644
--- a/cmd/devp2p/dnscmd.go
+++ b/cmd/devp2p/dnscmd.go
@@ -239,8 +239,8 @@ type dnsDefinition struct {
 type dnsMetaJSON struct {
 	URL          string    `json:"url,omitempty"`
 	Seq          uint      `json:"seq"`
-	Sig          string    `json:"signature"`
-	Links        []string  `json:"links,omitempty"`
+	Sig          string    `json:"signature,omitempty"`
+	Links        []string  `json:"links"`
 	LastModified time.Time `json:"lastModified"`
 }
 
@@ -251,6 +251,9 @@ func treeToDefinition(url string, t *dnsdisc.Tree) *dnsDefinition {
 		Sig:   t.Signature(),
 		Links: t.Links(),
 	}
+	if meta.Links == nil {
+		meta.Links = []string{}
+	}
 	return &dnsDefinition{Meta: meta, Nodes: t.Nodes()}
 }
 
@@ -262,6 +265,9 @@ func loadTreeDefinition(directory string) *dnsDefinition {
 	if err != nil && !os.IsNotExist(err) {
 		exit(err)
 	}
+	if def.Meta.Links == nil {
+		def.Meta.Links = []string{}
+	}
 	// Check link syntax.
 	for _, link := range def.Meta.Links {
 		if _, _, err := dnsdisc.ParseURL(link); err != nil {