diff --git a/src/resolvers.ts b/src/resolvers.ts
index 8789f36..c84dd6f 100644
--- a/src/resolvers.ts
+++ b/src/resolvers.ts
@@ -146,7 +146,10 @@ export const resolvers: Resolvers<ServerContext> = {
       const routeId = parent.route.id;
       const stopId = parent.stop.id;
 
-      const nextOrderedStop = await contextValue.repository.getOrderedStopByRouteAndStopId(routeId, stopId);
+      const currentOrderedStop = await contextValue.repository.getOrderedStopByRouteAndStopId(routeId, stopId);
+      if (!currentOrderedStop) return null;
+
+      const nextOrderedStop = currentOrderedStop.nextStop;
       if (!nextOrderedStop) return null;
 
       const nextStopObject = await contextValue.repository.getStopById(nextOrderedStop.stopId);