diff --git a/features.go b/features.go
index b0a4e7d2..0cfbfd37 100644
--- a/features.go
+++ b/features.go
@@ -13,4 +13,8 @@ var localFeatures = lnwire.NewFeatureVector([]lnwire.Feature{
 		Name: "new-ping-and-funding",
 		Flag: lnwire.RequiredFlag,
 	},
+	{
+		Name: "node-ann-feature-addr-swap",
+		Flag: lnwire.RequiredFlag,
+	},
 })
diff --git a/lnwire/node_announcement.go b/lnwire/node_announcement.go
index 47a8c35b..d010db66 100644
--- a/lnwire/node_announcement.go
+++ b/lnwire/node_announcement.go
@@ -120,8 +120,8 @@ func (a *NodeAnnouncement) Decode(r io.Reader, pver uint32) error {
 		&a.NodeID,
 		&a.RGBColor,
 		&a.Alias,
-		&a.Addresses,
 		&a.Features,
+		&a.Addresses,
 	)
 }
 
@@ -135,8 +135,8 @@ func (a *NodeAnnouncement) Encode(w io.Writer, pver uint32) error {
 		a.NodeID,
 		a.RGBColor,
 		a.Alias,
-		a.Addresses,
 		a.Features,
+		a.Addresses,
 	)
 }
 
@@ -166,8 +166,8 @@ func (a *NodeAnnouncement) DataToSign() ([]byte, error) {
 		a.NodeID,
 		a.RGBColor,
 		a.Alias,
-		a.Addresses,
 		a.Features,
+		a.Addresses,
 	)
 	if err != nil {
 		return nil, err