diff --git a/src/tuntap/tun.go b/src/tuntap/tun.go
index a21f8711..ed5d2d45 100644
--- a/src/tuntap/tun.go
+++ b/src/tuntap/tun.go
@@ -237,6 +237,7 @@ func (tun *TunAdapter) wrap(conn *yggdrasil.Conn) (c *tunConn, err error) {
 		stop:  make(chan struct{}),
 		alive: make(chan struct{}, 1),
 	}
+	c = &s
 	// Get the remote address and subnet of the other side
 	remoteNodeID := conn.RemoteAddr()
 	s.addr = *address.AddrForNodeID(&remoteNodeID)