diff --git a/src/resolvers/StopResolvers.ts b/src/resolvers/StopResolvers.ts
index 860e3be..9a2b55a 100644
--- a/src/resolvers/StopResolvers.ts
+++ b/src/resolvers/StopResolvers.ts
@@ -3,11 +3,19 @@ import { ServerContext } from "../ServerContext";
 
 export const StopResolvers: Resolvers<ServerContext> = {
   Stop: {
-    orderedStops: async (parent, args, contextValue, info) => {
-      return await contextValue.shuttleRepository.getOrderedStopsByStopId(parent.id);
+    orderedStops: async (parent, args, contextValue, _info) => {
+      const system = contextValue.systems.find((system) => system.id === parent.id);
+      if (!system) {
+        return [];
+      }
+      return await system.shuttleRepository.getOrderedStopsByStopId(parent.id);
     },
-    etas: async (parent, args, contextValue, info) => {
-      return await contextValue.shuttleRepository.getEtasForStopId(parent.id);
+    etas: async (parent, args, contextValue, _info) => {
+      const system = contextValue.systems.find((system) => system.id === parent.id);
+      if (!system) {
+        return [];
+      }
+      return await system.shuttleRepository.getEtasForStopId(parent.id);
     },
   },
 }