diff --git a/src/database/mongo/pubsub.js b/src/database/mongo/pubsub.js
index 6d51cd9afe..5b1fdfdc1c 100644
--- a/src/database/mongo/pubsub.js
+++ b/src/database/mongo/pubsub.js
@@ -2,10 +2,6 @@
 
 var mubsub = require('mubsub-nbb');
 var db = require('../mongo');
-const connString = db.getConnectionString();
+var client = mubsub(db.getConnectionString());
 
-var client = mubsub(connString);
-client.on('error', function (err) {
-	console.error('mongo pubsub error ' + connString, err);
-});
 module.exports = client.channel('pubsub');
diff --git a/test/mocks/databasemock.js b/test/mocks/databasemock.js
index bf9416ae62..ded9280644 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', 'true');
+	nconf.set('isCluster', 'false');
 }
 
 var dbType = nconf.get('database');