diff --git a/esrally/metrics.py b/esrally/metrics.py
index dc9fe500b..690df8a88 100644
--- a/esrally/metrics.py
+++ b/esrally/metrics.py
@@ -1424,21 +1424,16 @@ def list(self):
             return []
 
     def find_by_race_id(self, race_id):
-        filters = [{
-                "term": {
-                    "environment": self.environment_name
-                }
-            },
-            {
-                "term": {
-                    "race-id": race_id
-                }
-            }]
-
         query = {
             "query": {
                 "bool": {
-                    "filter": filters
+                    "filter": [
+                        {
+                            "term": {
+                                "race-id": race_id
+                            }
+                        }
+                    ]
                 }
             }
         }