diff --git a/src/database/mongo.js b/src/database/mongo.js
index 0374bb0967..ec9d29bb19 100644
--- a/src/database/mongo.js
+++ b/src/database/mongo.js
@@ -100,6 +100,7 @@ mongoModule.getConnectionOptions = function () {
 		reconnectTries: 3600,
 		reconnectInterval: 1000,
 		autoReconnect: true,
+		connectTimeoutMS: 60000,
 		useNewUrlParser: true,
 	};
 
diff --git a/src/database/mongo/pubsub.js b/src/database/mongo/pubsub.js
index 5b1fdfdc1c..a61c7f4767 100644
--- a/src/database/mongo/pubsub.js
+++ b/src/database/mongo/pubsub.js
@@ -2,6 +2,6 @@
 
 var mubsub = require('mubsub-nbb');
 var db = require('../mongo');
-var client = mubsub(db.getConnectionString());
+var client = mubsub(db.getConnectionString(), db.getConnectionOptions());
 
 module.exports = client.channel('pubsub');
diff --git a/test/mocks/databasemock.js b/test/mocks/databasemock.js
index ded9280644..bf9416ae62 100644
--- a/test/mocks/databasemock.js
+++ b/test/mocks/databasemock.js
@@ -35,7 +35,7 @@ nconf.defaults({
 
 if (!nconf.get('isCluster')) {
 	nconf.set('isPrimary', 'true');
-	nconf.set('isCluster', 'false');
+	nconf.set('isCluster', 'true');
 }
 
 var dbType = nconf.get('database');