diff --git a/src/loaders/ApiBasedShuttleRepositoryLoader.ts b/src/loaders/ApiBasedShuttleRepositoryLoader.ts
index 17c6fa0..5d6e952 100644
--- a/src/loaders/ApiBasedShuttleRepositoryLoader.ts
+++ b/src/loaders/ApiBasedShuttleRepositoryLoader.ts
@@ -215,6 +215,7 @@ export class ApiBasedShuttleRepositoryLoader implements ShuttleRepositoryLoader
             shuttleId: `${shuttleId}`,
             stopId: stopId,
             millisecondsSinceEpoch: Date.now(),
+            systemId: this.systemId,
           };
 
           this.repository.addOrUpdateEta(eta);
@@ -272,6 +273,7 @@ export class ApiBasedShuttleRepositoryLoader implements ShuttleRepositoryLoader
               routeId,
               stopId,
               position: index + 1,
+              systemId: this.systemId,
             };
           }
 
@@ -280,6 +282,7 @@ export class ApiBasedShuttleRepositoryLoader implements ShuttleRepositoryLoader
               routeId,
               stopId: jsonOrderedStopData[index - 1][1],
               position: index,
+              systemId: this.systemId,
             };
           }
           if (index < jsonOrderedStopData.length - 1) {
@@ -287,6 +290,7 @@ export class ApiBasedShuttleRepositoryLoader implements ShuttleRepositoryLoader
               routeId,
               stopId: jsonOrderedStopData[index + 1][1],
               position: index + 2,
+              systemId: this.systemId,
             };
           }