diff --git a/src/yggdrasil/tcp.go b/src/yggdrasil/tcp.go
index 873dd63c..6d923440 100644
--- a/src/yggdrasil/tcp.go
+++ b/src/yggdrasil/tcp.go
@@ -59,8 +59,6 @@ func (iface *tcpInterface) setExtraOptions(c net.Conn) {
 	switch sock := c.(type) {
 	case *net.TCPConn:
 		sock.SetNoDelay(true)
-		sock.SetKeepAlive(true)
-		sock.SetKeepAlivePeriod(iface.tcp_timeout)
 	// TODO something for socks5
 	default:
 	}