diff --git a/src/repositories/shuttle/__tests__/ShuttleRepositorySharedTests.test.ts b/src/repositories/shuttle/__tests__/ShuttleRepositorySharedTests.test.ts
index 08deaa2..59745e7 100644
--- a/src/repositories/shuttle/__tests__/ShuttleRepositorySharedTests.test.ts
+++ b/src/repositories/shuttle/__tests__/ShuttleRepositorySharedTests.test.ts
@@ -804,6 +804,10 @@ describe.each(repositoryImplementations)('$name', (holder) => {
       // Simulate arrival at stop 1
       const arrivalTime = new Date("2024-01-15T10:30:00Z");
       await repository.addOrUpdateShuttle(shuttle, arrivalTime.getTime());
+      
+      // Test that it actually emits the event correctly and not right after the shuttle arrives
+      await repository.addOrUpdateShuttle(shuttle, arrivalTime.getTime());
+      expect(listener).not.toHaveBeenCalled();
 
       shuttle.coordinates = { latitude: 12.5, longitude: 22.5 }; // Not at any stop