diff --git a/server/src/resolvers/AccessPoint.js b/server/src/resolvers/AccessPoint.js
index 67523b4..403c0ad 100644
--- a/server/src/resolvers/AccessPoint.js
+++ b/server/src/resolvers/AccessPoint.js
@@ -68,5 +68,10 @@ async function getStatsUsingAccessPointId(keys) {
     }
   })
 
-  return accessPointsWithStats
+  // order accessPointsWithStats in the same order as keys
+  const accessPointsWithStatsOrdered = ids.map(id =>
+    accessPointsWithStats.find(accessPoint => accessPoint.id === id)
+  )
+
+  return accessPointsWithStatsOrdered
 }