diff --git a/lib/adapter.js b/lib/adapter.js
index 293ee76a3..ec36cb70d 100644
--- a/lib/adapter.js
+++ b/lib/adapter.js
@@ -54,7 +54,8 @@ module.exports = (function() {
       recordQueryStats: false,
       retryMiliSeconds: 5000,
       numberOfRetries: 5,
-
+      bufferMaxEntries: -1,
+      
       // Server Options
       ssl: false,
       poolSize: 5,
diff --git a/lib/connection.js b/lib/connection.js
index c16e004c4..63f0b90ab 100644
--- a/lib/connection.js
+++ b/lib/connection.js
@@ -119,7 +119,8 @@ Connection.prototype._buildConnection = function _buildConnection(cb) {
     forceServerObjectId: this.config.forceServerObjectId,
     recordQueryStats: this.config.recordQueryStats,
     retryMiliSeconds: this.config.retryMiliSeconds,
-    numberOfRetries: this.config.numberOfRetries
+    numberOfRetries: this.config.numberOfRetries,
+    bufferMaxEntries: this.config.bufferMaxEntries
   };
 
   // Support for encoded auth credentials