diff --git a/roles/grafana/files/nut-status-dashboard.json b/roles/grafana/files/nut-status-dashboard.json
index 2ad200f..71183ed 100644
--- a/roles/grafana/files/nut-status-dashboard.json
+++ b/roles/grafana/files/nut-status-dashboard.json
@@ -16,7 +16,8 @@
         "label": "UPS",
         "type": "query",
         "datasource": { "type": "prometheus", "uid": "prometheus" },
-        "query": { "query": "label_values(network_ups_tools_device_info, instance)", "refId": "A" },
+        "query": { "query": "query_result(count by (instance) (network_ups_tools_device_info))", "refId": "A" },
+        "regex": "/.*instance=\"([^\"]+)\".*/",
         "refresh": 2,
         "multi": false,
         "includeAll": false,