diff --git a/services/web/app/coffee/Features/Editor/EditorController.coffee b/services/web/app/coffee/Features/Editor/EditorController.coffee
index bff4ddec1c..21179a0deb 100644
--- a/services/web/app/coffee/Features/Editor/EditorController.coffee
+++ b/services/web/app/coffee/Features/Editor/EditorController.coffee
@@ -13,15 +13,14 @@ LimitationsManager = require("../Subscription/LimitationsManager")
 AuthorizationManager = require("../Security/AuthorizationManager")
 EditorRealTimeController = require("./EditorRealTimeController")
 TrackChangesManager = require("../TrackChanges/TrackChangesManager")
-settings = require('settings-sharelatex')
+Settings = require('settings-sharelatex')
 slReqIdHelper = require('soa-req-id')
 async = require('async')
 ConnectedUsersManager = require("../ConnectedUsers/ConnectedUsersManager")
 _ = require('underscore')
-rclientPub = require("redis").createClient(settings.redis.web.port, settings.redis.web.host)
-rclientPub.auth(settings.redis.web.password)
-rclientSub = require("redis").createClient(settings.redis.web.port, settings.redis.web.host)
-rclientSub.auth(settings.redis.web.password)
+redis = require("redis-sharelatex")
+rclientPub = redis.createClient(Settings.redis.web)
+rclientSub = redis.createClient(Settings.redis.web)
 
 module.exports = EditorController =
 	protocolVersion: 2
diff --git a/services/web/app/coffee/Features/Editor/EditorRealTimeController.coffee b/services/web/app/coffee/Features/Editor/EditorRealTimeController.coffee
index 5b1b452c93..76f4f909c1 100644
--- a/services/web/app/coffee/Features/Editor/EditorRealTimeController.coffee
+++ b/services/web/app/coffee/Features/Editor/EditorRealTimeController.coffee
@@ -1,8 +1,7 @@
-settings = require 'settings-sharelatex'
-rclientPub = require("redis").createClient(settings.redis.web.port, settings.redis.web.host)
-rclientPub.auth(settings.redis.web.password)
-rclientSub = require("redis").createClient(settings.redis.web.port, settings.redis.web.host)
-rclientSub.auth(settings.redis.web.password)
+Settings = require 'settings-sharelatex'
+redis = require("redis-sharelatex")
+rclientPub = redis.createClient(Settings.redis.web)
+rclientSub = redis.createClient(Settings.redis.web)
 
 module.exports = EditorRealTimeController =
 	rclientPub: rclientPub
diff --git a/services/web/app/coffee/Features/Editor/EditorUpdatesController.coffee b/services/web/app/coffee/Features/Editor/EditorUpdatesController.coffee
index 4385123541..bf73666b27 100644
--- a/services/web/app/coffee/Features/Editor/EditorUpdatesController.coffee
+++ b/services/web/app/coffee/Features/Editor/EditorUpdatesController.coffee
@@ -1,8 +1,8 @@
 logger = require "logger-sharelatex"
 metrics = require('../../infrastructure/Metrics')
 Settings = require 'settings-sharelatex'
-rclient = require("redis").createClient(Settings.redis.web.port, Settings.redis.web.host)
-rclient.auth(Settings.redis.web.password)
+redis = require("redis-sharelatex")
+rclient = redis.createClient(Settings.redis.web)
 DocumentUpdaterHandler = require('../DocumentUpdater/DocumentUpdaterHandler')
 EditorRealTimeController = require("./EditorRealTimeController")
 
diff --git a/services/web/app/coffee/infrastructure/Server.coffee b/services/web/app/coffee/infrastructure/Server.coffee
index f8845ea84a..79a7cb443e 100644
--- a/services/web/app/coffee/infrastructure/Server.coffee
+++ b/services/web/app/coffee/infrastructure/Server.coffee
@@ -9,10 +9,15 @@ socketIoConfig = require('./SocketIoConfig')
 soareqid = require('soa-req-id')
 Router = require('../router')
 metrics.inc("startup")
-redis = require('redis')
-RedisStore = require('connect-redis')(express)
 SessionSockets = require('session.socket.io')
-sessionStore = new RedisStore(host:Settings.redis.web.host, port:Settings.redis.web.port, pass:Settings.redis.web.password)
+
+
+redis = require("redis-sharelatex")
+rclient = redis.createClient(Settings.redis.web)
+
+RedisStore = require('connect-redis')(express)
+sessionStore = new RedisStore(client:rclient)
+
 cookieParser = express.cookieParser(Settings.security.sessionSecret)
 oneDayInMilliseconds = 86400000
 ReferalConnect = require('../Features/Referal/ReferalConnect')