diff --git a/plugins/gridfs/gridfs.cc b/plugins/gridfs/gridfs.cc
index e16b37d4..f2fdcfd9 100644
--- a/plugins/gridfs/gridfs.cc
+++ b/plugins/gridfs/gridfs.cc
@@ -50,14 +50,14 @@ static void uwsgi_gridfs_do(struct wsgi_request *wsgi_req, struct uwsgi_gridfs_m
 		std::unique_ptr<mongo::DBClientBase> conn;
 
 		if (ugm->replica) {
-			conn = std::unique_ptr<mongo::DBClientBase> (new mongo::DBClientReplicaSet(ugm->replica, ugm->servers));
+			conn = std::unique_ptr<mongo::DBClientBase> (new mongo::DBClientReplicaSet(ugm->replica, ugm->servers, ugm->timeout));
 			dynamic_cast<mongo::DBClientReplicaSet *>(conn.get())->connect();
 		}
 		else {
-			conn = std::unique_ptr<mongo::DBClientBase> (new mongo::DBClientConnection());
+			conn = std::unique_ptr<mongo::DBClientBase> (new mongo::DBClientConnection(true, 0, ugm->timeout));
 			dynamic_cast<mongo::DBClientConnection *>(conn.get())->connect(ugm->server);
 		}
-		
+
 		try {
 			if (ugm->username && ugm->password) {
 				std::string errmsg;