diff --git a/flight/libraries/sanitycheck.c b/flight/libraries/sanitycheck.c
index 1fdc09c83..ccbb33f10 100644
--- a/flight/libraries/sanitycheck.c
+++ b/flight/libraries/sanitycheck.c
@@ -141,6 +141,7 @@ int32_t configuration_check()
         }
         // intentionally no break as this also needs pathfollower
         case FLIGHTMODESETTINGS_FLIGHTMODEPOSITION_POSITIONHOLD:
+        case FLIGHTMODESETTINGS_FLIGHTMODEPOSITION_COURSELOCK:
         case FLIGHTMODESETTINGS_FLIGHTMODEPOSITION_MAGICROAM:
         case FLIGHTMODESETTINGS_FLIGHTMODEPOSITION_MAGICLEASH:
         case FLIGHTMODESETTINGS_FLIGHTMODEPOSITION_ABSOLUTEPOSITION:
diff --git a/flight/modules/ManualControl/manualcontrol.c b/flight/modules/ManualControl/manualcontrol.c
index 950077993..f225799c3 100644
--- a/flight/modules/ManualControl/manualcontrol.c
+++ b/flight/modules/ManualControl/manualcontrol.c
@@ -205,6 +205,7 @@ static void manualControlTask(void)
         break;
 #ifndef PIOS_EXCLUDE_ADVANCED_FEATURES
     case FLIGHTSTATUS_FLIGHTMODE_POSITIONHOLD:
+    case FLIGHTSTATUS_FLIGHTMODE_COURSELOCK:
     case FLIGHTSTATUS_FLIGHTMODE_MAGICROAM:
     case FLIGHTSTATUS_FLIGHTMODE_MAGICLEASH:
     case FLIGHTSTATUS_FLIGHTMODE_ABSOLUTEPOSITION:
diff --git a/flight/modules/ManualControl/pathfollowerhandler.c b/flight/modules/ManualControl/pathfollowerhandler.c
index b1cd06252..63edc5d75 100644
--- a/flight/modules/ManualControl/pathfollowerhandler.c
+++ b/flight/modules/ManualControl/pathfollowerhandler.c
@@ -68,6 +68,9 @@ void pathFollowerHandler(bool newinit)
         case FLIGHTSTATUS_FLIGHTMODE_POSITIONHOLD:
             plan_setup_positionHold();
             break;
+        case FLIGHTSTATUS_FLIGHTMODE_COURSELOCK:
+            plan_setup_CourseLock();
+            break;
         case FLIGHTSTATUS_FLIGHTMODE_MAGICROAM:
             plan_setup_MagicRoam();
             break;
@@ -92,6 +95,9 @@ void pathFollowerHandler(bool newinit)
     }
 
     switch (flightMode) {
+    case FLIGHTSTATUS_FLIGHTMODE_COURSELOCK:
+        plan_run_CourseLock();
+        break;
     case FLIGHTSTATUS_FLIGHTMODE_MAGICROAM:
         plan_run_MagicRoam();
         break;