diff --git a/router/overlay.go b/router/overlay.go
index ae5fb4a1..27dd896d 100644
--- a/router/overlay.go
+++ b/router/overlay.go
@@ -107,20 +107,16 @@ type OverlayForwarder interface {
 
 type NullOverlay struct{}
 
-func (NullOverlay) StartConsumingPackets(*Peer, *Peers, OverlayConsumer) error {
-	return nil
+func (NullOverlay) AddFeaturesTo(map[string]string) {
 }
 
 func (NullOverlay) PrepareConnection(OverlayConnectionParams) (OverlayConnection, error) {
 	return NullOverlay{}, nil
 }
 
-func (NullOverlay) InvalidateRoutes() {
+func (NullOverlay) Diagnostics() interface{} {
+	return nil
 }
-
-func (NullOverlay) InvalidateShortIDs() {
-}
-
 func (NullOverlay) Confirm() {
 }
 
@@ -132,13 +128,6 @@ func (NullOverlay) ErrorChannel() <-chan error {
 	return nil
 }
 
-func (NullOverlay) AddFeaturesTo(map[string]string) {
-}
-
-func (NullOverlay) Forward(ForwardPacketKey) FlowOp {
-	return DiscardingFlowOp{}
-}
-
 func (NullOverlay) Stop() {
 }
 
@@ -149,6 +138,18 @@ func (NullOverlay) DisplayName() string {
 	return "null"
 }
 
-func (NullOverlay) Diagnostics() interface{} {
+type NullNetworkOverlay struct{ NullOverlay }
+
+func (NullNetworkOverlay) InvalidateRoutes() {
+}
+
+func (NullNetworkOverlay) InvalidateShortIDs() {
+}
+
+func (NullNetworkOverlay) StartConsumingPackets(*Peer, *Peers, OverlayConsumer) error {
 	return nil
 }
+
+func (NullNetworkOverlay) Forward(ForwardPacketKey) FlowOp {
+	return DiscardingFlowOp{}
+}
diff --git a/router/router.go b/router/router.go
index 6b29d558..42b13dbd 100644
--- a/router/router.go
+++ b/router/router.go
@@ -78,7 +78,7 @@ func NewRouter(config Config, name PeerName, nickName string, overlay NetworkOve
 	}
 
 	if overlay == nil {
-		overlay = NullOverlay{}
+		overlay = NullNetworkOverlay{}
 	}
 
 	router.Overlay = overlay