diff --git a/etcdserver/server.go b/etcdserver/server.go
index 33e116cbb..7465d1712 100644
--- a/etcdserver/server.go
+++ b/etcdserver/server.go
@@ -211,7 +211,8 @@ func NewServer(cfg *ServerConfig) (*EtcdServer, error) {
 	haveWAL := wal.Exist(cfg.WALDir())
 	ss := snap.New(cfg.SnapDir())
 
-	pt, err := transport.NewTransport(cfg.PeerTLSInfo, cfg.peerDialTimeout())
+	// use timeout transport to pair with remote timeout listeners
+	pt, err := transport.NewTimeoutTransport(cfg.PeerTLSInfo, cfg.peerDialTimeout(), 0, 0)
 	if err != nil {
 		return nil, err
 	}
diff --git a/rafthttp/transport.go b/rafthttp/transport.go
index 6a6fa12f6..3625bd001 100644
--- a/rafthttp/transport.go
+++ b/rafthttp/transport.go
@@ -143,7 +143,8 @@ func (t *Transport) Start() error {
 	if err != nil {
 		return err
 	}
-	t.pipelineRt, err = transport.NewTransport(t.TLSInfo, t.DialTimeout)
+	// use timeout transport to pair with remote timeout listeners
+	t.pipelineRt, err = transport.NewTimeoutTransport(t.TLSInfo, t.DialTimeout, 0, 0)
 	if err != nil {
 		return err
 	}