diff --git a/gulp/gulp-console.js b/gulp/gulp-console.js
index b3951df00d..816f56e134 100644
--- a/gulp/gulp-console.js
+++ b/gulp/gulp-console.js
@@ -24,8 +24,8 @@ let improveRepl = (context) => {
 
   const isProd = nconf.get('NODE_ENV') === 'production';
   const mongooseOptions = !isProd ? {} : {
-    replset: { socketOptions: { keepAlive: 1, connectTimeoutMS: 30000 } },
-    server: { socketOptions: { keepAlive: 1, connectTimeoutMS: 30000 } },
+    keepAlive: 1,
+    connectTimeoutMS: 30000,
   };
   mongoose.connect(
     nconf.get('NODE_DB_URI'),
diff --git a/website/server/libs/setupMongoose.js b/website/server/libs/setupMongoose.js
index 52b446a7ff..d816c7ff2f 100644
--- a/website/server/libs/setupMongoose.js
+++ b/website/server/libs/setupMongoose.js
@@ -11,9 +11,9 @@ mongoose.Promise = Bluebird;
 
 // Do not connect to MongoDB when in maintenance mode
 if (MAINTENANCE_MODE !== 'true') {
-  let mongooseOptions = !IS_PROD ? {} : {
-    replset: { socketOptions: { keepAlive: 120, connectTimeoutMS: 30000 } },
-    server: { socketOptions: { keepAlive: 120, connectTimeoutMS: 30000 } },
+  const mongooseOptions = !IS_PROD ? {} : {
+    keepAlive: 120,
+    connectTimeoutMS: 30000,
   };
 
   const NODE_DB_URI = nconf.get('IS_TEST') ? nconf.get('TEST_DB_URI') : nconf.get('NODE_DB_URI');