diff --git a/client/auth.go b/client/auth.go
index 006f71e11..200009609 100644
--- a/client/auth.go
+++ b/client/auth.go
@@ -304,7 +304,7 @@ func (c *Conn) writeAuthHandshake() error {
 		}
 
 		currentSequence := c.Sequence
-		c.Conn = packet.NewBufferedConn(tlsConn, c.BufferSize)
+		c.Conn = packet.NewConnWithTimeout(tlsConn, c.ReadTimeout, c.WriteTimeout, c.BufferSize)
 		c.Sequence = currentSequence
 	}