diff --git a/homeassistant/components/zha/diagnostics.py b/homeassistant/components/zha/diagnostics.py index 3e598c4d5f8..f276630dfee 100644 --- a/homeassistant/components/zha/diagnostics.py +++ b/homeassistant/components/zha/diagnostics.py @@ -166,5 +166,7 @@ def get_cluster_attr_data(cluster: Cluster) -> dict: } for attr_id, attr_def in cluster.attributes.items() }, - UNSUPPORTED_ATTRIBUTES: cluster.unsupported_attributes, + UNSUPPORTED_ATTRIBUTES: sorted( + cluster.unsupported_attributes, key=lambda v: (isinstance(v, str), v) + ), }