diff --git a/router/local_peer.go b/router/local_peer.go
index 0a15076d..b9ea939b 100644
--- a/router/local_peer.go
+++ b/router/local_peer.go
@@ -18,13 +18,14 @@ type LocalPeer struct {
 type LocalPeerAction func()
 
 func NewLocalPeer(name PeerName, nickName string, router *Router) *LocalPeer {
-	return &LocalPeer{Peer: NewPeer(name, nickName, 0, 0), router: router}
-}
-
-func (peer *LocalPeer) Start() {
 	actionChan := make(chan LocalPeerAction, ChannelSize)
-	peer.actionChan = actionChan
+	peer := &LocalPeer{
+		Peer:       NewPeer(name, nickName, 0, 0),
+		router:     router,
+		actionChan: actionChan,
+	}
 	go peer.actorLoop(actionChan)
+	return peer
 }
 
 func (peer *LocalPeer) Forward(dstPeer *Peer, df bool, frame []byte, dec *EthernetDecoder) error {
diff --git a/router/router.go b/router/router.go
index 01446322..13203bfc 100644
--- a/router/router.go
+++ b/router/router.go
@@ -83,7 +83,6 @@ func (router *Router) Start() {
 		po, err = NewPcapO(router.Iface.Name)
 		checkFatal(err)
 	}
-	router.Ourself.Start()
 	router.Routes.Start()
 	router.ConnectionMaker.Start()
 	router.UDPListener = router.listenUDP(router.Port, po)