diff --git a/redis-persistence/src/main/java/com/netflix/conductor/jedis/RedisClusterJedisProvider.java b/redis-persistence/src/main/java/com/netflix/conductor/jedis/RedisClusterJedisProvider.java
index ef663469ac..43e8f538a1 100644
--- a/redis-persistence/src/main/java/com/netflix/conductor/jedis/RedisClusterJedisProvider.java
+++ b/redis-persistence/src/main/java/com/netflix/conductor/jedis/RedisClusterJedisProvider.java
@@ -27,9 +27,15 @@ public RedisClusterJedisProvider(HostSupplier hostSupplier){
     public JedisCommands get() {
         // FIXME This doesn't seem very safe, but is how it was in the code this was moved from.
         Host host = new ArrayList<Host>(hostSupplier.getHosts()).get(0);
+        String password = host.getPassword();
         GenericObjectPoolConfig poolConfig = new GenericObjectPoolConfig();
         poolConfig.setMinIdle(5);
         poolConfig.setMaxTotal(1000);
-        return new JedisCluster(new HostAndPort(host.getHostName(), host.getPort()), poolConfig);
+        if (password.length() == 0) {
+            return new JedisCluster(new HostAndPort(host.getHostName(), host.getPort()), poolConfig);
+        } else {
+            return new JedisCluster(new HostAndPort(host.getHostName(), host.getPort()), 100000, 100000,
+            3, password, poolConfig);
+        }
     }
 }