diff --git a/server/config.js b/server/config.js
index 72b750ea..a6ad0bd2 100644
--- a/server/config.js
+++ b/server/config.js
@@ -69,6 +69,16 @@ const conf = convict({
     default: false,
     env: 'REDIS_EVENT_EXPIRE'
   },
+  redis_retry_time: {
+    format: Number,
+    default: 10000,
+    env: 'REDIS_RETRY_TIME'
+  },
+  redis_retry_delay: {
+    format: Number,
+    default: 500,
+    env: 'REDIS_RETRY_DELAY'
+  },
   listen_address: {
     format: 'ipaddress',
     default: '0.0.0.0',
diff --git a/server/storage/redis.js b/server/storage/redis.js
index 645a8e7c..3118aadc 100644
--- a/server/storage/redis.js
+++ b/server/storage/redis.js
@@ -11,12 +11,12 @@ module.exports = function(config) {
   const client = redis.createClient({
     host: config.redis_host,
     retry_strategy: options => {
-      if (options.total_retry_time > 10000) {
+      if (options.total_retry_time > config.redis_retry_time) {
         client.emit('error', 'Retry time exhausted');
         return new Error('Retry time exhausted');
       }
 
-      return 500;
+      return config.redis_retry_delay;
     }
   });