diff --git a/channel.go b/channel.go
index b4f89771a7..9b25c6d86c 100644
--- a/channel.go
+++ b/channel.go
@@ -145,7 +145,9 @@ func (c *serialChannel) wait() error {
 
 func (c *serialChannel) listen() (net.Listener, error) {
 	// Initialize Yamux server.
-	session, err := yamux.Server(c.serialConn, nil)
+	config := yamux.DefaultConfig()
+	config.EnableKeepAlive = false
+	session, err := yamux.Server(c.serialConn, config)
 	if err != nil {
 		return nil, err
 	}
diff --git a/protocols/client/client.go b/protocols/client/client.go
index 7bd1843d0c..d2229b4edb 100644
--- a/protocols/client/client.go
+++ b/protocols/client/client.go
@@ -147,7 +147,9 @@ func agentDialer(addr *url.URL, enableYamux bool) dialer {
 		}()
 
 		var session *yamux.Session
-		session, err = yamux.Client(conn, nil)
+		config := yamux.DefaultConfig()
+		config.EnableKeepAlive = false
+		session, err = yamux.Client(conn, config)
 		if err != nil {
 			return nil, err
 		}