diff --git a/api/app_analytics/migrate_to_pg.py b/api/app_analytics/migrate_to_pg.py
index c90ddbc17fdd..f9ad270eace0 100644
--- a/api/app_analytics/migrate_to_pg.py
+++ b/api/app_analytics/migrate_to_pg.py
@@ -9,7 +9,11 @@ def migrate_feature_evaluations(migrate_till: int = 30) -> None:
     for i in range(migrate_till):
         range_start = f"-{i+1}d"
         range_stop = f"-{i}d"
-        query = f"from (bucket: {read_bucket}) |> range(start: {range_start}, stop: {range_stop})"
+        query = (
+            f'from (bucket: "{read_bucket}") '
+            f"|> range(start: {range_start}, stop: {range_stop}) "
+            f'|> filter(fn: (r) => r._measurement == "feature_evaluation")'
+        )
 
         result = query_api.query(query)
 
diff --git a/api/tests/unit/app_analytics/test_migrate_to_pg.py b/api/tests/unit/app_analytics/test_migrate_to_pg.py
index d744f631c42a..59adc858acb4 100644
--- a/api/tests/unit/app_analytics/test_migrate_to_pg.py
+++ b/api/tests/unit/app_analytics/test_migrate_to_pg.py
@@ -55,13 +55,25 @@ def test_migrate_feature_evaluations(mocker: MockerFixture) -> None:
     mock_query_api.assert_has_calls(
         [
             mocker.call.query(
-                f"from (bucket: {read_bucket}) |> range(start: -1d, stop: -0d)"
+                (
+                    f'from (bucket: "{read_bucket}") '
+                    f"|> range(start: -1d, stop: -0d) "
+                    f'|> filter(fn: (r) => r._measurement == "feature_evaluation")'
+                )
             ),
             mocker.call.query(
-                f"from (bucket: {read_bucket}) |> range(start: -2d, stop: -1d)"
+                (
+                    f'from (bucket: "{read_bucket}") '
+                    f"|> range(start: -2d, stop: -1d) "
+                    f'|> filter(fn: (r) => r._measurement == "feature_evaluation")'
+                )
             ),
             mocker.call.query(
-                f"from (bucket: {read_bucket}) |> range(start: -3d, stop: -2d)"
+                (
+                    f'from (bucket: "{read_bucket}") '
+                    f"|> range(start: -3d, stop: -2d) "
+                    f'|> filter(fn: (r) => r._measurement == "feature_evaluation")'
+                )
             ),
         ]
     )