diff --git a/redisson/src/main/java/org/redisson/connection/ReplicatedConnectionManager.java b/redisson/src/main/java/org/redisson/connection/ReplicatedConnectionManager.java
index b9e43194b..c618a38fe 100644
--- a/redisson/src/main/java/org/redisson/connection/ReplicatedConnectionManager.java
+++ b/redisson/src/main/java/org/redisson/connection/ReplicatedConnectionManager.java
@@ -138,15 +138,18 @@ public class ReplicatedConnectionManager extends MasterSlaveConnectionManager {
 
     private void checkFailedSlaves(Set<InetSocketAddress> slaveIPs) {
         MasterSlaveEntry entry = getEntry(singleSlotRange.getStartSlot());
-        Set<InetSocketAddress> failedSlaves = entry.getAllEntries().stream()
+        Set<RedisClient> failedSlaves = entry.getAllEntries().stream()
                 .filter(e -> e.getNodeType() == NodeType.SLAVE
                                     && !slaveIPs.contains(e.getClient().getAddr()))
-                .map(e -> e.getClient().getAddr())
+                .map(e -> e.getClient())
                 .collect(Collectors.toSet());
 
-        for (InetSocketAddress slave : failedSlaves) {
-            if (entry.slaveDown(slave, FreezeReason.MANAGER)) {
+        for (RedisClient slave : failedSlaves) {
+            if (entry.slaveDown(slave.getAddr(), FreezeReason.MANAGER)) {
                 log.info("slave: {} is down", slave);
+                disconnectNode(new RedisURI(slave.getConfig().getAddress().getScheme(),
+                                            slave.getAddr().getAddress().getHostAddress(),
+                                            slave.getAddr().getPort()));
             }
         }
     }
@@ -183,6 +186,7 @@ public class ReplicatedConnectionManager extends MasterSlaveConnectionManager {
                         RFuture<RedisClient> changeFuture = changeMaster(singleSlotRange.getStartSlot(), uri);
                         changeFuture.onComplete((res, e) -> {
                             if (e != null) {
+                                log.error("Unable to change master to " + addr, e);
                                 currentMaster.compareAndSet(addr, master);
                             }
                         });