diff --git a/server.go b/server.go
index 32502f9..7bd94eb 100644
--- a/server.go
+++ b/server.go
@@ -191,6 +191,9 @@ func (u *Upgrader) Upgrade(w http.ResponseWriter, r *http.Request, responseHeade
 		netConn.Close()
 		return nil, err
 	}
+	if u.HandshakeTimeout > 0 {
+		netConn.SetWriteDeadline(time.Time{})
+	}
 
 	return c, nil
 }