diff --git a/lib/messages-archive.js b/lib/messages-archive.js
index 500f8c9..03fbd62 100644
--- a/lib/messages-archive.js
+++ b/lib/messages-archive.js
@@ -27,8 +27,11 @@ function composeRedisCounterKeyword(origin, direction) {
 }
 
 function incrementCounter(origin, direction) {
-    logger.warn('Undefined redisClient, not incrementing messages counter! #FF8E765E12E2');
-    redisClient && redisClient.INCR(composeRedisCounterKeyword(origin, direction), () => {});
+    if (!redisClient) {
+        logger.warn('Undefined redisClient, not incrementing messages counter! #FF8E765E12E2');
+    } else {
+        redisClient.INCR(composeRedisCounterKeyword(origin, direction), () => {});
+    }
 }
 
 /**