diff --git a/src/repositories/shuttle/eta/InMemorySelfUpdatingETARepository.ts b/src/repositories/shuttle/eta/InMemorySelfUpdatingETARepository.ts
index 868178f..89212ab 100644
--- a/src/repositories/shuttle/eta/InMemorySelfUpdatingETARepository.ts
+++ b/src/repositories/shuttle/eta/InMemorySelfUpdatingETARepository.ts
@@ -119,17 +119,17 @@ export class InMemorySelfUpdatingETARepository extends BaseInMemoryETARepository
       toStopId: nextStop.stopId,
     }, [
       {
-        from: new Date(oneWeekAgo.getTime() - (twoHoursInMs)),
-        to: oneWeekAgo,
+        from: twoHoursAgo,
+        to: new Date(),
       },
       {
         from: new Date(oneDayAgo.getTime() - (twoHoursInMs)),
         to: oneDayAgo,
       },
       {
-        from: twoHoursAgo,
-        to: new Date(),
-      }
+        from: new Date(oneWeekAgo.getTime() - (twoHoursInMs)),
+        to: oneWeekAgo,
+      },
     ]);
 
     if (travelTimeSeconds == undefined) return;
diff --git a/src/repositories/shuttle/eta/RedisSelfUpdatingETARepository.ts b/src/repositories/shuttle/eta/RedisSelfUpdatingETARepository.ts
index 0514ec2..76e723b 100644
--- a/src/repositories/shuttle/eta/RedisSelfUpdatingETARepository.ts
+++ b/src/repositories/shuttle/eta/RedisSelfUpdatingETARepository.ts
@@ -140,17 +140,17 @@ export class RedisSelfUpdatingETARepository extends BaseRedisETARepository imple
       toStopId: nextStop.stopId,
     }, [
       {
-        from: new Date(oneWeekAgo.getTime() - (twoHoursInMs)),
-        to: oneWeekAgo,
+        from: twoHoursAgo,
+        to: new Date(),
       },
       {
         from: new Date(oneDayAgo.getTime() - (twoHoursInMs)),
         to: oneDayAgo,
       },
       {
-        from: twoHoursAgo,
-        to: new Date(),
-      }
+        from: new Date(oneWeekAgo.getTime() - (twoHoursInMs)),
+        to: oneWeekAgo,
+      },
     ]);
 
     if (travelTimeSeconds == undefined) return;