diff --git a/p2p/protocol/holepunch/holepuncher.go b/p2p/protocol/holepunch/holepuncher.go
index 1ae16bdfce..3c470709af 100644
--- a/p2p/protocol/holepunch/holepuncher.go
+++ b/p2p/protocol/holepunch/holepuncher.go
@@ -50,14 +50,15 @@ type holePuncher struct {
 	filter AddrFilter
 }
 
-func newHolePuncher(h host.Host, ids identify.IDService, listenAddrs func() []ma.Multiaddr, tracer *tracer, filter AddrFilter) *holePuncher {
+func newHolePuncher(h host.Host, ids identify.IDService, listenAddrs func() []ma.Multiaddr, directDialTimeout time.Duration, tracer *tracer, filter AddrFilter) *holePuncher {
 	hp := &holePuncher{
-		host:        h,
-		ids:         ids,
-		active:      make(map[peer.ID]struct{}),
-		tracer:      tracer,
-		filter:      filter,
-		listenAddrs: listenAddrs,
+		host:              h,
+		ids:               ids,
+		active:            make(map[peer.ID]struct{}),
+		tracer:            tracer,
+		filter:            filter,
+		listenAddrs:       listenAddrs,
+		directDialTimeout: directDialTimeout,
 	}
 	hp.ctx, hp.ctxCancel = context.WithCancel(context.Background())
 	h.Network().Notify((*netNotifiee)(hp))
diff --git a/p2p/protocol/holepunch/svc.go b/p2p/protocol/holepunch/svc.go
index 0e4c90c7f9..924b28ad4a 100644
--- a/p2p/protocol/holepunch/svc.go
+++ b/p2p/protocol/holepunch/svc.go
@@ -148,8 +148,7 @@ func (s *Service) waitForPublicAddr() {
 		// service is closed
 		return
 	}
-	s.holePuncher = newHolePuncher(s.host, s.ids, s.listenAddrs, s.tracer, s.filter)
-	s.holePuncher.directDialTimeout = s.directDialTimeout
+	s.holePuncher = newHolePuncher(s.host, s.ids, s.listenAddrs, s.directDialTimeout, s.tracer, s.filter)
 	close(s.hasPublicAddrsChan)
 }