diff --git a/src/repositories/shuttle/RedisShuttleRepository.ts b/src/repositories/shuttle/RedisShuttleRepository.ts
index 42ecbfd..3fb63c0 100644
--- a/src/repositories/shuttle/RedisShuttleRepository.ts
+++ b/src/repositories/shuttle/RedisShuttleRepository.ts
@@ -556,6 +556,7 @@ export class RedisShuttleRepository extends BaseRedisRepository implements Shutt
       this.emit(ShuttleRepositoryEvent.SHUTTLE_REMOVED, shuttle);
 
       await this.removeShuttleLastStopIfExists(shuttleId);
+      await this.markShuttleAsNotAtStop(shuttleId);
 
       return shuttle;
     }