diff --git a/src/repositories/ApiBasedRepository.ts b/src/repositories/ApiBasedRepository.ts
index f83f17c..8ad821f 100644
--- a/src/repositories/ApiBasedRepository.ts
+++ b/src/repositories/ApiBasedRepository.ts
@@ -83,7 +83,7 @@ export class ApiBasedRepository implements GetterRepository {
 
     if (this.cache?.etasForStopId && this.cache.etasForStopId[stopId]) {
       const etas = this.cache.etasForStopId[stopId];
-      const foundEta = etas.find((eta) => eta.stopId === stopId);
+      const foundEta = etas.find((eta) => eta.shuttleId === shuttleId);
       if (foundEta) {
         return foundEta;
       }