diff --git a/docs/release-notes/release-notes-0.18.0.md b/docs/release-notes/release-notes-0.18.0.md
index c17ab56405..f554cd3e80 100644
--- a/docs/release-notes/release-notes-0.18.0.md
+++ b/docs/release-notes/release-notes-0.18.0.md
@@ -392,6 +392,11 @@ bitcoin peers' feefilter values into account](https://github.com/lightningnetwor
   and makes TLV Onions, Static Remote Keys, Gossip Queries, compulsory features
   for LND's peers. Data Loss Protection has been compulsory for years.
 
+* [Don't Require Gossip Queries](https://github.com/lightningnetwork/lnd/pull/8615)
+  This change undoes a portion of what was introduced in #8275 due to a subsequent
+  [spec change](https://github.com/lightning/bolts/pull/1092/commits/e0ee59f3c92b7c98be8dfc47b7db358b45baf9de)
+  that meant we shouldn't require it.
+
 ## Testing
 
 * Added fuzz tests for [onion
diff --git a/feature/default_sets.go b/feature/default_sets.go
index e423ad08dc..3b7e0f7ea3 100644
--- a/feature/default_sets.go
+++ b/feature/default_sets.go
@@ -14,7 +14,7 @@ var defaultSetDesc = setDesc{
 		SetInit:    {}, // I
 		SetNodeAnn: {}, // N
 	},
-	lnwire.GossipQueriesRequired: {
+	lnwire.GossipQueriesOptional: {
 		SetInit:    {}, // I
 		SetNodeAnn: {}, // N
 	},
diff --git a/feature/manager_internal_test.go b/feature/manager_internal_test.go
index dc254adf96..683b4dfa32 100644
--- a/feature/manager_internal_test.go
+++ b/feature/manager_internal_test.go
@@ -151,7 +151,7 @@ func TestUpdateFeatureSets(t *testing.T) {
 			SetInit:    {}, // I
 			SetNodeAnn: {}, // N
 		},
-		lnwire.GossipQueriesRequired: {
+		lnwire.GossipQueriesOptional: {
 			SetNodeAnn: {}, // N
 		},
 	}
@@ -201,7 +201,7 @@ func TestUpdateFeatureSets(t *testing.T) {
 				),
 				SetNodeAnn: lnwire.NewRawFeatureVector(
 					lnwire.DataLossProtectRequired,
-					lnwire.GossipQueriesRequired,
+					lnwire.GossipQueriesOptional,
 					lnwire.FeatureBit(1000),
 				),
 			},
@@ -222,7 +222,7 @@ func TestUpdateFeatureSets(t *testing.T) {
 				),
 				SetNodeAnn: lnwire.NewRawFeatureVector(
 					lnwire.DataLossProtectRequired,
-					lnwire.GossipQueriesRequired,
+					lnwire.GossipQueriesOptional,
 				),
 			},
 			config: Config{
@@ -242,7 +242,7 @@ func TestUpdateFeatureSets(t *testing.T) {
 				),
 				SetNodeAnn: lnwire.NewRawFeatureVector(
 					lnwire.DataLossProtectRequired,
-					lnwire.GossipQueriesRequired,
+					lnwire.GossipQueriesOptional,
 					lnwire.FeatureBit(500),
 				),
 				SetInvoice: lnwire.NewRawFeatureVector(
diff --git a/peer/brontide_test.go b/peer/brontide_test.go
index 46c1bec4d7..8ea8846b2f 100644
--- a/peer/brontide_test.go
+++ b/peer/brontide_test.go
@@ -1138,7 +1138,6 @@ func TestPeerCustomMessage(t *testing.T) {
 		initReplyMsg := lnwire.NewInitMessage(
 			lnwire.NewRawFeatureVector(
 				lnwire.DataLossProtectRequired,
-				lnwire.GossipQueriesOptional,
 			),
 			lnwire.NewRawFeatureVector(),
 		)