diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/MogoRouteOverlayManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/MogoRouteOverlayManager.java
index 32de230e96..d3e2008e0c 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/MogoRouteOverlayManager.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/MogoRouteOverlayManager.java
@@ -72,7 +72,12 @@ public class MogoRouteOverlayManager implements
         if (from != 1 || location == null) {
             return;
         }
-        if (isArriveAtStation.get() || autopilotMode.get() != 1) {
+        if (isArriveAtStation.get()) {
+            RouteOverlayDrawer.getInstance().clearMogoRouteOverlay();
+            return;
+        }
+        boolean force = FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData;
+        if (!force && autopilotMode.get() != 1) {
             RouteOverlayDrawer.getInstance().clearMogoRouteOverlay();
             return;
         }