diff --git a/src/replication.c b/src/replication.c
index 2c0c47a27..f442d86d6 100644
--- a/src/replication.c
+++ b/src/replication.c
@@ -2023,6 +2023,14 @@ void slaveofCommand(client *c) {
     } else {
         long port;
 
+        if (c->flags & CLIENT_SLAVE)
+        {
+            /* If a client is already a replica they cannot run this command,
+	     * because it involves flushing all replicas (including this client) */
+            addReplyError(c, "Command is not valid when client is a replica.");
+            return;
+        }
+
         if ((getLongFromObjectOrReply(c, c->argv[2], &port, NULL) != C_OK))
             return;