diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/routeoverlay/MogoRouteOverlayManager.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/routeoverlay/MogoRouteOverlayManager.java
index f4f3a42934..838a597dc8 100644
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/routeoverlay/MogoRouteOverlayManager.java
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/routeoverlay/MogoRouteOverlayManager.java
@@ -76,7 +76,7 @@ public class MogoRouteOverlayManager implements
             RouteOverlayDrawer.getInstance().clearMogoRouteOverlay();
             return;
         }
-        boolean force = FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData;
+        boolean force = FunctionBuildConfig.isDemoMode && FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData;
         if (!force && autopilotMode.get() != 2) {
             RouteOverlayDrawer.getInstance().clearMogoRouteOverlay();
             return;