diff --git a/src/resolvers/StopResolvers.ts b/src/resolvers/StopResolvers.ts
index 89f6444..0c3ea54 100644
--- a/src/resolvers/StopResolvers.ts
+++ b/src/resolvers/StopResolvers.ts
@@ -4,14 +4,14 @@ import { ServerContext } from "../ServerContext";
 export const StopResolvers: Resolvers<ServerContext> = {
   Stop: {
     orderedStops: async (parent, args, contextValue, _info) => {
-      const system = contextValue.findSystemById(parent.id);
+      const system = contextValue.findSystemById(parent.systemId);
       if (!system) {
         return [];
       }
       return await system.shuttleRepository.getOrderedStopsByStopId(parent.id);
     },
     etas: async (parent, args, contextValue, _info) => {
-      const system = contextValue.findSystemById(parent.id);
+      const system = contextValue.findSystemById(parent.systemId);
       if (!system) {
         return [];
       }