diff --git a/shared/classes/RedisClient/index.js b/shared/classes/RedisClient/index.js
index bf62bae2..23ef1b91 100644
--- a/shared/classes/RedisClient/index.js
+++ b/shared/classes/RedisClient/index.js
@@ -21,11 +21,19 @@ function composeURL() {
 export default ({
     withWsAdapter = false
 } = {}) => {
-    let client = createClient({
+    let clientOpts = {
         url: composeURL(),
-        password: process.env.REDIS_PASSWORD,
-        username: process.env.REDIS_USERNAME,
-    })
+    }
+
+    if (process.env.REDIS_PASSWORD) {
+        clientOpts.password = process.env.REDIS_PASSWORD
+    }
+
+    if (process.env.REDIS_USERNAME) {
+        clientOpts.username = process.env.REDIS_USERNAME
+    }
+
+    let client = createClient()
 
     if (withWsAdapter) {
         client.subClient = client.duplicate()