diff --git a/src/config.cpp b/src/config.cpp
index 2c9a9d518..4035ca376 100644
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -1496,8 +1496,15 @@ void configGetCommand(client *c) {
             listIter li;
             listNode *ln;
             listRewind(g_pserver->masters, &li);
+            bool fFirst = true;
             while ((ln = listNext(&li)))
             {
+                if (!fFirst)
+                {
+                    addReplyBulkCString(c,optname);
+                    matches++;
+                }
+                fFirst = false;
                 struct redisMaster *mi = (struct redisMaster*)listNodeValue(ln);
                 snprintf(buf,sizeof(buf),"%s %d",
                     mi->masterhost, mi->masterport);