diff --git a/dashboards/dashboard_base.py b/dashboards/dashboard_base.py
index 9be7461369e31efa2db9f358d5150e39710cda74..c22dc0d0f88769d6b0c7ad23c9bb4a9b3cc619c1 100644
--- a/dashboards/dashboard_base.py
+++ b/dashboards/dashboard_base.py
@@ -22,9 +22,9 @@ def get_annotation(*args, **kwargs):
 
 
 def get_commit_annotation(datasource: str, color: str, name: str, measurment_name: str):
-    query = ("SELECT \"commit\" from "
-             f"( SELECT first(/./) FROM \"{measurment_name}\" "
-             "WHERE host =~ /^$host$/ AND $timeFilter GROUP BY \"commit\" )")
+    query = ("SELECT first(\"commit\") FROM "
+             f"( SELECT * FROM \"{measurment_name}\" "
+             "WHERE host =~ /^$host$/ AND $timeFilter) GROUP BY \"commit\"")
     return get_annotation(datasource, color, name, query)