diff --git a/config/socket.io.js b/config/socket.io.js
index 4ea8a6b1..420a7ce4 100644
--- a/config/socket.io.js
+++ b/config/socket.io.js
@@ -11,9 +11,11 @@ module.exports = function (app, db) {
 	var server = http.createServer(app);
 
 	var io = socketio(config.socketPort, { transports: ['websocket', 'polling'] });
-	var redis = require('socket.io-redis');
-	io.adapter(redis( process.env.REDIS_URL || { host: process.env.REDIS_DB_PORT_6379_TCP_ADDR || '127.0.0.1' , port: process.env.REDIS_DB_PORT_6379_TCP_PORT || 6379 }));
-
+	
+	if(process.env.DISABLE_CLUSTER_MODE === "TRUE"){
+		var redis = require('socket.io-redis');
+		io.adapter(redis( process.env.REDIS_URL || { host: process.env.REDIS_DB_PORT_6379_TCP_ADDR || '127.0.0.1' , port: process.env.REDIS_DB_PORT_6379_TCP_PORT || 6379 }));
+	}
 	// Add an event listener to the 'connection' event
 	io.on('connection', function (socket) {
 		config.getGlobbedFiles('./app/sockets/**.js').forEach(function (socketConfiguration) {