diff --git a/src/cluster.c b/src/cluster.c
index a188bef335..76672f4df6 100644
--- a/src/cluster.c
+++ b/src/cluster.c
@@ -899,7 +899,7 @@ void clusterCommand(client *c) {
     } else if (!strcasecmp(c->argv[1]->ptr, "info") && c->argc == 2) {
         /* CLUSTER INFO */
 
-        sds info = genClusterInfoString();
+        sds info = genClusterInfoString(sdsempty());
 
         /* Produce the reply protocol. */
         addReplyVerbatim(c, info, sdslen(info), "txt");
diff --git a/src/cluster.h b/src/cluster.h
index 597717ec8b..f9b8d428b8 100644
--- a/src/cluster.h
+++ b/src/cluster.h
@@ -75,7 +75,7 @@ unsigned long getClusterConnectionsCount(void);
 int isClusterHealthy(void);
 
 sds clusterGenNodesDescription(client *c, int filter, int tls_primary);
-sds genClusterInfoString(void);
+sds genClusterInfoString(sds info);
 /* handle implementation specific debug cluster commands. Return 1 if handled, 0 otherwise. */
 int handleDebugClusterCommand(client *c);
 const char **clusterDebugCommandExtendedHelp(void);
diff --git a/src/cluster_legacy.c b/src/cluster_legacy.c
index a1bdbf9a58..30a5548c1a 100644
--- a/src/cluster_legacy.c
+++ b/src/cluster_legacy.c
@@ -7006,8 +7006,7 @@ void clusterCommandShards(client *c) {
     dictReleaseIterator(di);
 }
 
-sds genClusterInfoString(void) {
-    sds info = sdsempty();
+sds genClusterInfoString(sds info) {
     char *statestr[] = {"ok", "fail"};
     int slots_assigned = 0, slots_ok = 0, slots_pfail = 0, slots_fail = 0;
 
diff --git a/src/debug.c b/src/debug.c
index cdd76e4a17..48109a13d5 100644
--- a/src/debug.c
+++ b/src/debug.c
@@ -1859,7 +1859,7 @@ __attribute__((noinline)) void logStackTrace(void *eip, int uplevel, int current
 #endif /* HAVE_BACKTRACE */
 
 sds genClusterDebugString(sds infostring) {
-    sds cluster_info = genClusterInfoString();
+    sds cluster_info = genClusterInfoString(sdsempty());
     sds cluster_nodes = clusterGenNodesDescription(NULL, 0, 0);
 
     infostring = sdscatprintf(infostring, "\r\n# Cluster info\r\n");
diff --git a/src/server.c b/src/server.c
index ab07193988..650bb832e6 100644
--- a/src/server.c
+++ b/src/server.c
@@ -6467,6 +6467,7 @@ sds genValkeyInfoString(dict *section_dict, int all_sections, int everything) {
                             "# Cluster\r\n"
                             "cluster_enabled:%d\r\n",
                             server.cluster_enabled);
+        if (server.cluster_enabled) info = genClusterInfoString(info);
     }
 
     /* Scripting engines */