diff --git a/frontend/src/structures/vehicle.ts b/frontend/src/structures/vehicle.ts
index dfbdb7f0f..dc2b0d477 100644
--- a/frontend/src/structures/vehicle.ts
+++ b/frontend/src/structures/vehicle.ts
@@ -112,7 +112,7 @@ export default class Vehicle {
     }
 
     public setHeading(heading: number) {
-        if (!store.state.settings.shuttleSlideEnabled) {
+        if (!store.state.settings.shuttleSlideEnabled || this.pointIndex == null || this.endPointIndex == null) {
             this.marker.setRotationAngle(heading - 45);
             this.marker.bindPopup(this.getMessage());
         } else {