diff --git a/tcp/src/main/java/org/jivesoftware/smack/XMPPTCPConnection.java b/tcp/src/main/java/org/jivesoftware/smack/XMPPTCPConnection.java
index e8cd2e7da..4f836d863 100644
--- a/tcp/src/main/java/org/jivesoftware/smack/XMPPTCPConnection.java
+++ b/tcp/src/main/java/org/jivesoftware/smack/XMPPTCPConnection.java
@@ -711,8 +711,6 @@ public class XMPPTCPConnection extends XMPPConnection {
         // Secure the plain connection
         socket = context.getSocketFactory().createSocket(plain,
                 plain.getInetAddress().getHostAddress(), plain.getPort(), true);
-        socket.setSoTimeout(0);
-        socket.setKeepAlive(true);
         // Initialize the reader and writer with the new secured version
         initReaderAndWriter();
         // Proceed to do the handshake