diff --git a/src/repositories/shuttle/__tests__/ShuttleRepositorySharedTests.test.ts b/src/repositories/shuttle/__tests__/ShuttleRepositorySharedTests.test.ts
index 038ea56..f875f2e 100644
--- a/src/repositories/shuttle/__tests__/ShuttleRepositorySharedTests.test.ts
+++ b/src/repositories/shuttle/__tests__/ShuttleRepositorySharedTests.test.ts
@@ -386,6 +386,20 @@ describe.each(repositoryImplementations)('$name', (holder) => {
       expect(remainingShuttles).toHaveLength(mockShuttles.length - 1);
     });
 
+    test("removes shuttle last stop if exists", async () => {
+      const { route, stop1, systemId } = await setupRouteAndOrderedStops();
+      const mockShuttle = generateMockShuttles()[0];
+      mockShuttle.routeId = route.id;
+      mockShuttle.coordinates = stop1.coordinates;
+      mockShuttle.systemId = systemId;
+
+      await repository.addOrUpdateShuttle(mockShuttle);
+      await repository.removeShuttleIfExists(mockShuttle.id);
+
+      const lastStopData = await repository.getShuttleLastStopArrival(mockShuttle.id);
+      expect(lastStopData).toBeUndefined();
+    });
+
     test("does nothing if shuttle doesn't exist", async () => {
       const systemId = "1";
       const mockShuttles = generateMockShuttles();