diff --git a/helm/templates/grafana/dashboard-config-map.yaml b/helm/templates/grafana/dashboard-config-map.yaml
index ea46039181247dec5e19cedb7eeb676119a41c28..6c2d5a2f2188b76619ee4ce9cf379f3b240f4749 100644
--- a/helm/templates/grafana/dashboard-config-map.yaml
+++ b/helm/templates/grafana/dashboard-config-map.yaml
@@ -71,7 +71,7 @@ data:
         "steppedLine": false,
         "targets": [
           {
-            "expr": "sum by (topic) (rate(kafka_server_brokertopicmetrics_messagesin_total[60s]))",
+            "expr": "sum by (topic) (rate(kafka_server_brokertopicmetrics_messagesin_total{topic='input'}[60s]))",
             "format": "time_series",
             "intervalFactor": 1,
             "legendFormat": "{{Messages In Per Second}}",
@@ -162,7 +162,7 @@ data:
         "steppedLine": false,
         "targets": [
           {
-            "expr": "sum(kafka_server_brokertopicmetrics_messagesin_total{topic='output'})",
+            "expr": "sum by (topic) (rate(kafka_server_brokertopicmetrics_messagesin_total{topic='output'}[60s]))",
             "format": "time_series",
             "intervalFactor": 1,
             "legendFormat": "{{Messages Out Per Second}}",