diff --git a/redisson/src/main/java/org/redisson/client/handler/RedisChannelInitializer.java b/redisson/src/main/java/org/redisson/client/handler/RedisChannelInitializer.java
index cb2db04fd..10776dc6a 100644
--- a/redisson/src/main/java/org/redisson/client/handler/RedisChannelInitializer.java
+++ b/redisson/src/main/java/org/redisson/client/handler/RedisChannelInitializer.java
@@ -106,7 +106,7 @@ public class RedisChannelInitializer extends ChannelInitializer<Channel> {
     
     private void initSsl(final RedisClientConfig config, Channel ch) throws KeyStoreException, IOException,
             NoSuchAlgorithmException, CertificateException, SSLException, UnrecoverableKeyException {
-        if (!"rediss".equals(config.getAddress().getScheme())) {
+        if (!config.getAddress().isSsl()) {
             return;
         }
 
diff --git a/redisson/src/main/java/org/redisson/cluster/ClusterConnectionManager.java b/redisson/src/main/java/org/redisson/cluster/ClusterConnectionManager.java
index beb672c62..daf46e7fa 100644
--- a/redisson/src/main/java/org/redisson/cluster/ClusterConnectionManager.java
+++ b/redisson/src/main/java/org/redisson/cluster/ClusterConnectionManager.java
@@ -114,7 +114,7 @@ public class ClusterConnectionManager extends MasterSlaveConnectionManager {
                 }
                 
                 clusterNodesCommand = RedisCommands.CLUSTER_NODES;
-                if ("rediss".equals(addr.getScheme())) {
+                if (addr.isSsl()) {
                     clusterNodesCommand = RedisCommands.CLUSTER_NODES_SSL;
                 }