diff --git a/src/main/java/redis/clients/jedis/SslOptions.java b/src/main/java/redis/clients/jedis/SslOptions.java
index 5221d77736..b79dad3c27 100644
--- a/src/main/java/redis/clients/jedis/SslOptions.java
+++ b/src/main/java/redis/clients/jedis/SslOptions.java
@@ -52,8 +52,8 @@ public class SslOptions {
 
     private static final Logger logger = LoggerFactory.getLogger(SslOptions.class);
 
-    private final String keyManagerAlgorithm = KeyManagerFactory.getDefaultAlgorithm();
     //private final String keyManagerAlgorithm = TrustManagerFactory.getDefaultAlgorithm(); // Lettuce
+    private final String keyManagerAlgorithm = KeyManagerFactory.getDefaultAlgorithm();
 
     private final String trustManagerAlgorithm = TrustManagerFactory.getDefaultAlgorithm();
 
@@ -107,11 +107,13 @@ public static class Builder {
 
         private Resource keystoreResource;
 
-        private char[] keystorePassword = new char[0];
+        //private char[] keystorePassword = new char[0]; // Lettuce
+        private char[] keystorePassword = null;
 
         private Resource truststoreResource;
 
-        private char[] truststorePassword = new char[0];
+        //private char[] truststorePassword = new char[0]; // Lettuce
+        private char[] truststorePassword = null;
 
         private SSLParameters sslParameters;