diff --git a/lib/_tls_wrap.js b/lib/_tls_wrap.js
index f3061c47bc4..92a649bc94a 100644
--- a/lib/_tls_wrap.js
+++ b/lib/_tls_wrap.js
@@ -171,11 +171,11 @@ function TLSSocket(socket, options) {
   // Disallow wrapping TLSSocket in TLSSocket
   assert(!(socket instanceof TLSSocket));
 
-  net.Socket.call(this, socket && {
-    handle: socket._handle,
-    allowHalfOpen: socket.allowHalfOpen,
-    readable: socket.readable,
-    writable: socket.writable
+  net.Socket.call(this, {
+    handle: socket && socket._handle,
+    allowHalfOpen: socket && socket.allowHalfOpen,
+    readable: true,
+    writable: true
   });
 
   // To prevent assertion in afterConnect()
diff --git a/test/simple/test-tls-connect-given-socket.js b/test/simple/test-tls-connect-given-socket.js
index 649ef825d94..ab571c7a811 100644
--- a/test/simple/test-tls-connect-given-socket.js
+++ b/test/simple/test-tls-connect-given-socket.js
@@ -55,6 +55,8 @@ var server = tls.createServer(options, function(socket) {
           server.close();
       });
     });
+    assert(client.readable);
+    assert(client.writable);
   }
 
   // Already connected socket