diff --git a/lnwire/extra_bytes.go b/lnwire/extra_bytes.go
index 17fd6df67..200f313ca 100644
--- a/lnwire/extra_bytes.go
+++ b/lnwire/extra_bytes.go
@@ -90,6 +90,10 @@ func (e *ExtraOpaqueData) ExtractRecords(recordProducers ...tlv.RecordProducer)
 		records = append(records, producer.Record())
 	}
 
+	// Ensure that the set of records are sorted before we attempt to
+	// decode from the stream, to ensure they're canonical.
+	tlv.SortRecords(records)
+
 	extraBytesReader := bytes.NewReader(*e)
 
 	tlvStream, err := tlv.NewStream(records...)