diff --git a/salt/grafana/templates/cpucount.json b/salt/grafana/templates/cpucount.json
index c3917ebd7..c41889565 100644
--- a/salt/grafana/templates/cpucount.json
+++ b/salt/grafana/templates/cpucount.json
@@ -2,7 +2,7 @@
     "allValue": null,
     "current": {},
     "datasource": "InfluxDB",
-    "definition": "SELECT \"n_cpus\" FROM \"system\" WHERE \"host\" =~ /^$servername$/",
+    "definition": "SELECT last(\"n_cpus\") FROM \"system\" WHERE \"host\" =~ /^$servername$/",
     "description": null,
     "error": null,
     "hide": 2,
@@ -11,7 +11,7 @@
     "multi": false,
     "name": "cpucount",
     "options": [],
-    "query": "SELECT \"n_cpus\" FROM \"system\" WHERE \"host\" =~ /^$servername$/",
+    "query": "SELECT last(\"n_cpus\") FROM \"system\" WHERE \"host\" =~ /^$servername$/",
     "refresh": 1,
     "regex": "",
     "skipUrlSync": false,