diff --git a/lnwire/channel_announcement.go b/lnwire/channel_announcement.go
index 3595fda7..09243c86 100644
--- a/lnwire/channel_announcement.go
+++ b/lnwire/channel_announcement.go
@@ -51,6 +51,9 @@ var _ Message = (*ChannelAnnouncement)(nil)
 //
 // This is part of the lnwire.Message interface.
 func (a *ChannelAnnouncement) Validate() error {
+	// TODO(roasbeef): move validation to discovery service
+	return nil
+
 	var sigHash []byte
 
 	sigHash = wire.DoubleSha256(a.FirstNodeID.SerializeCompressed())
diff --git a/lnwire/node_announcement.go b/lnwire/node_announcement.go
index ef4f491f..aa2948be 100644
--- a/lnwire/node_announcement.go
+++ b/lnwire/node_announcement.go
@@ -95,6 +95,9 @@ var _ Message = (*NodeAnnouncement)(nil)
 //
 // This is part of the lnwire.Message interface.
 func (a *NodeAnnouncement) Validate() error {
+	// TODO(roasbeef): move validation to discovery service
+	return nil
+
 	if err := a.Alias.Validate(); err != nil {
 		return err
 	}