diff --git a/grafana/dashboards/EngineeringThroughputAndCycleTime.json b/grafana/dashboards/EngineeringThroughputAndCycleTime.json
index eed7cbad219..2b452200fcf 100644
--- a/grafana/dashboards/EngineeringThroughputAndCycleTime.json
+++ b/grafana/dashboards/EngineeringThroughputAndCycleTime.json
@@ -18,7 +18,7 @@
   "editable": true,
   "fiscalYearStartMonth": 0,
   "graphTooltip": 0,
-  "id": 17,
+  "id": 20,
   "links": [],
   "liveNow": false,
   "panels": [
@@ -351,7 +351,6 @@
       "pluginVersion": "8.0.6",
       "targets": [
         {
-
           "format": "table",
           "group": [],
           "hide": false,
@@ -477,7 +476,7 @@
           "hide": false,
           "metricColumn": "none",
           "rawQuery": true,
-          "rawSql": "SELECT\n  DATE_ADD(date(i.resolution_date), INTERVAL -$interval(date(i.resolution_date))+1 DAY) as time,\n  sum(case when i.status = 'DONE' then i.story_point else 0 end) as 'Story Points Completed',\n  i.id\nFROM issues i\n\tjoin board_issues bi on i.id = bi.issue_id\n\tjoin boards b on bi.board_id = b.id\n\tjoin project_mapping pm on b.id = pm.row_id\nWHERE\n  $__timeFilter(i.resolution_date)\n  and pm.project_name in ($project)\ngroup by 1,3\norder by 1",
+          "rawSql": "SELECT\n  DATE_ADD(date(i.resolution_date), INTERVAL -$interval(date(i.resolution_date))+1 DAY) as time,\n  sum(case when i.status = 'DONE' then i.story_point else 0 end) as 'Story Points Completed'\nFROM (\n  SELECT DISTINCT i.id, i.resolution_date, i.status, i.story_point\n  FROM issues i\n    join board_issues bi on i.id = bi.issue_id\n    join boards b on bi.board_id = b.id\n    join project_mapping pm on b.id = pm.row_id\n  WHERE\n    $__timeFilter(i.resolution_date)\n    and pm.project_name in ($project)\n) as i\ngroup by 1\norder by 1",
           "refId": "A",
           "select": [
             [
@@ -1873,6 +1872,6 @@
   "timezone": "",
   "title": "Engineering Throughput and Cycle Time",
   "uid": "Jaaimc67k",
-  "version": 3,
+  "version": 1,
   "weekStart": ""
 }
\ No newline at end of file