diff --git a/src/main/config/config.c b/src/main/config/config.c
index 4c6e124f54..d476a6ed7d 100755
--- a/src/main/config/config.c
+++ b/src/main/config/config.c
@@ -699,7 +699,7 @@ void activateConfig(void)
 #ifdef TELEMETRY
     telemetryUseConfig(&masterConfig.telemetryConfig);
 #endif
-
+    currentProfile->pidProfile.pidController = constrain(currentProfile->pidProfile.pidController, 1, 2); // This should prevent UNUSED values. CF 1.11 support
     pidSetController(currentProfile->pidProfile.pidController);
 
 #ifdef GPS
diff --git a/src/main/flight/pid.h b/src/main/flight/pid.h
index 494f284708..189093b397 100644
--- a/src/main/flight/pid.h
+++ b/src/main/flight/pid.h
@@ -36,7 +36,7 @@ typedef enum {
 } pidIndex_e;
 
 typedef enum {
-    PID_CONTROLLER_MWREWRITE,
+    PID_CONTROLLER_MWREWRITE = 1,
     PID_CONTROLLER_LUX_FLOAT,
     PID_COUNT
 } pidControllerType_e;
diff --git a/src/main/io/serial_cli.c b/src/main/io/serial_cli.c
index ac0eb0d071..a39e9b32ee 100644
--- a/src/main/io/serial_cli.c
+++ b/src/main/io/serial_cli.c
@@ -337,7 +337,7 @@ static const char * const lookupTableGimbalMode[] = {
 };
 
 static const char * const lookupTablePidController[] = {
-    "MWREWRITE", "LUX"
+    "UNUSED", "MWREWRITE", "LUX"
 };
 
 static const char * const lookupTableSerialRX[] = {