diff --git a/bbb-webhooks/application.js b/bbb-webhooks/application.js
index e2c0c5424f94f20e5e02911e82311d17fb0edf4e..4c16b5e52678dde0faa58229a5b42718612aaa1a 100644
--- a/bbb-webhooks/application.js
+++ b/bbb-webhooks/application.js
@@ -11,7 +11,7 @@ const async = require("async");
 // process to perform the callback calls.
 // TODO: add port (-p) and log level (-l) to the command line args
 module.exports = class Application {
-  
+
   constructor() {
     this.webHooks = new WebHooks();
     this.webServer = new WebServer();
diff --git a/bbb-webhooks/hook.js b/bbb-webhooks/hook.js
index f15537bb13409332e1fd8673222a9c15e7003c90..21c1c6dceaea2b2eb7cf1aa3b3795e64ae1bbfae 100644
--- a/bbb-webhooks/hook.js
+++ b/bbb-webhooks/hook.js
@@ -36,7 +36,7 @@ module.exports = class Hook {
     this.externalMeetingID = null;
     this.queue = [];
     this.emitter = null;
-    this.redisClient = Application.redisClient;
+    this.redisClient = Application.redisClient();
     this.permanent = false;
     this.getRaw = false;
   }
@@ -266,7 +266,7 @@ module.exports = class Hook {
   // Gets all hooks from redis to populate the local database.
   // Calls `callback()` when done.
   static resync(callback) {
-    let client = Application.redisClient;
+    let client = Application.redisClient();
     // Remove previous permanent hooks
     for (let hk = 1; hk <= config.get("hooks.permanentURLs").length; hk++) {
       client.srem(config.get("redis.keys.hooks"), hk, (error, reply) => {
diff --git a/bbb-webhooks/id_mapping.js b/bbb-webhooks/id_mapping.js
index f9285d318926a3e7dcbd2b281b36a405422e1030..f409f40a889a689afbf72fad4171e248f3c994bc 100644
--- a/bbb-webhooks/id_mapping.js
+++ b/bbb-webhooks/id_mapping.js
@@ -33,7 +33,7 @@ module.exports = class IDMapping {
     this.externalMeetingID = null;
     this.internalMeetingID = null;
     this.lastActivity = null;
-    this.redisClient = Application.redisClient;
+    this.redisClient = Application.redisClient();
   }
 
   save(callback) {
@@ -180,7 +180,7 @@ module.exports = class IDMapping {
   // Gets all mappings from redis to populate the local database.
   // Calls `callback()` when done.
   static resync(callback) {
-    let client = Application.redisClient;
+    let client = Application.redisClient();
     let tasks = [];
 
     return client.smembers(config.get("redis.keys.mappings"), (error, mappings) => {
diff --git a/bbb-webhooks/userMapping.js b/bbb-webhooks/userMapping.js
index 3571396a52ec36df7dc86421219d4559ae01830b..056e78a7a5b2586b5c52a4f2ec9452bd769c26d8 100644
--- a/bbb-webhooks/userMapping.js
+++ b/bbb-webhooks/userMapping.js
@@ -33,7 +33,7 @@ module.exports = class UserMapping {
     this.internalUserID = null;
     this.meetingId = null;
     this.user = null;
-    this.redisClient = Application.redisClient;
+    this.redisClient = Application.redisClient();
   }
 
   save(callback) {
@@ -165,7 +165,7 @@ module.exports = class UserMapping {
   // Gets all mappings from redis to populate the local database.
   // Calls `callback()` when done.
   static resync(callback) {
-    let client = Application.redisClient;
+    let client = Application.redisClient();
     let tasks = [];
 
     return client.smembers(config.get("redis.keys.userMaps"), (error, mappings) => {
diff --git a/bbb-webhooks/web_hooks.js b/bbb-webhooks/web_hooks.js
index 9f2531ad1cd749d452d1e4895734aa5c05f7f241..5503ae2ee7b98d3c4b08fadd66114dc64fb07bb4 100644
--- a/bbb-webhooks/web_hooks.js
+++ b/bbb-webhooks/web_hooks.js
@@ -14,7 +14,7 @@ const UserMapping = require("./userMapping.js");
 module.exports = class WebHooks {
 
   constructor() {
-    this.subscriberEvents = Application.redisClient;
+    this.subscriberEvents = Application.redisClient();
   }
 
   start(callback) {
@@ -73,7 +73,7 @@ module.exports = class WebHooks {
       }
     });
 
-    for (i = 0; i < config.get("hooks.channels"); ++i) {
+    for (var i = 0; i < config.get("hooks.channels"); ++i) {
       const channel = config.get("hooks.channels")[i];
       this.subscriberEvents.psubscribe(channel);
     }