diff --git a/src/cluster.c b/src/cluster.c
index 5728d580..1147a742 100644
--- a/src/cluster.c
+++ b/src/cluster.c
@@ -933,6 +933,8 @@ int clusterProcessPacket(clusterLink *link) {
 
                 /* Master node changed for this slave? */
                 if (sender->slaveof != master) {
+                    if (sender->slaveof)
+                        clusterNodeRemoveSlave(sender->slaveof,sender);
                     clusterNodeAddSlave(master,sender);
                     sender->slaveof = master;
                 }