diff --git a/pokemon_v2/api.py b/pokemon_v2/api.py
index 7454badd9..590721839 100644
--- a/pokemon_v2/api.py
+++ b/pokemon_v2/api.py
@@ -988,9 +988,9 @@ def get(self, request, pokemon_id):
         encounter_objects = Encounter.objects.filter(pokemon=pokemon)
 
         area_ids = (
-            encounter_objects.order_by("location_area")
-            .distinct("location_area")
-            .values_list("location_area", flat=True)
+            encounter_objects.values_list("location_area", flat=True)
+            .distinct()
+            .order_by("location_area")
         )
 
         location_area_objects = LocationArea.objects.filter(pk__in=area_ids)
@@ -1004,11 +1004,10 @@ def get(self, request, pokemon_id):
             area_encounters = encounter_objects.filter(location_area_id=area_id)
 
             version_ids = (
-                area_encounters.order_by("version_id")
-                .distinct("version_id")
-                .values_list("version_id", flat=True)
+                area_encounters.values_list("version_id", flat=True)
+                .distinct()
+                .order_by("version_id")
             )
-
             version_details_list = []
 
             for version_id in version_ids: