diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/cluster/state/RestClusterStateAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/cluster/state/RestClusterStateAction.java
index 0454d15ebec..97558f3a64b 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/cluster/state/RestClusterStateAction.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/cluster/state/RestClusterStateAction.java
@@ -120,6 +120,13 @@ public class RestClusterStateAction extends BaseRestHandler {
                             builder.startObject(node.id());
                             builder.field("name", node.name());
                             builder.field("transport_address", node.address().toString());
+
+                            builder.startObject("attributes");
+                            for (Map.Entry<String, String> attr : node.attributes().entrySet()) {
+                                builder.field(attr.getKey(), attr.getValue());
+                            }
+                            builder.endObject();
+
                             builder.endObject();
                         }
                         builder.endObject();