diff --git a/lib/_tls_wrap.js b/lib/_tls_wrap.js
index 7615de6bd71cb5..cadf29bdc25f06 100644
--- a/lib/_tls_wrap.js
+++ b/lib/_tls_wrap.js
@@ -429,12 +429,6 @@ TLSSocket.prototype._init = function(socket, wrap) {
   var options = this._tlsOptions;
   var ssl = this._handle;
 
-  // lib/net.js expect this value to be non-zero if write hasn't been flushed
-  // immediately
-  // TODO(indutny): revise this solution, it might be 1 before handshake and
-  // represent real writeQueueSize during regular writes.
-  ssl.writeQueueSize = 1;
-
   this.server = options.server;
 
   // For clients, we will always have either a given ca list or be using
diff --git a/lib/net.js b/lib/net.js
index 4cd2cf6bc2833f..82787d8d35fa29 100644
--- a/lib/net.js
+++ b/lib/net.js
@@ -465,7 +465,7 @@ Object.defineProperty(Socket.prototype, 'readyState', {
 Object.defineProperty(Socket.prototype, 'bufferSize', {
   get: function() {
     if (this._handle) {
-      return this._handle.writeQueueSize + this._writableState.length;
+      return this._writableState.length;
     }
   }
 });
@@ -767,7 +767,7 @@ Socket.prototype._writeGeneric = function(writev, data, encoding, cb) {
 
   // If it was entirely flushed, we can write some more right now.
   // However, if more is left in the queue, then wait until that clears.
-  if (req.async && this._handle.writeQueueSize !== 0)
+  if (req.async)
     req.cb = cb;
   else
     cb();
diff --git a/test/parallel/test-tls-buffersize.js b/test/parallel/test-tls-buffersize.js
new file mode 100644
index 00000000000000..a997c9e975b6ad
--- /dev/null
+++ b/test/parallel/test-tls-buffersize.js
@@ -0,0 +1,36 @@
+'use strict';
+require('../common');
+const assert = require('assert');
+const tls = require('tls');
+const fixtures = require('../common/fixtures');
+
+const options = {
+  key: fixtures.readSync('test_key.pem'),
+  cert: fixtures.readSync('test_cert.pem')
+};
+
+const iter = 10;
+
+const server = tls.createServer(options, (socket) => {
+  socket.pipe(socket);
+  socket.on('end', () => {
+    server.close();
+  });
+});
+
+server.listen(0, () => {
+  const client = tls.connect({
+    port: server.address().port,
+    rejectUnauthorized: false
+  }, () => {
+    for (let i = 1; i < iter; i++) {
+      client.write('a');
+      assert.strictEqual(client.bufferSize, i);
+    }
+    client.end();
+  });
+
+  client.on('finish', () => {
+    assert.strictEqual(client.bufferSize, 0);
+  });
+});