diff --git a/src/main/msp/msp.c b/src/main/msp/msp.c
index e537abbfd1..0d39f90533 100644
--- a/src/main/msp/msp.c
+++ b/src/main/msp/msp.c
@@ -1128,6 +1128,7 @@ static bool mspProcessOutCommand(mspDescriptor_t srcDesc, int16_t cmdMSP, sbuf_t
 #else
         sbufWriteU16(dst, 0);
 #endif
+        sbufWriteU8(dst, CONTROL_RATE_PROFILE_COUNT);
         break;
     }
 
diff --git a/src/main/target/common_pre.h b/src/main/target/common_pre.h
index 1220594f3d..b616303190 100644
--- a/src/main/target/common_pre.h
+++ b/src/main/target/common_pre.h
@@ -301,7 +301,9 @@
 #define USE_HUFFMAN
 
 #define PID_PROFILE_COUNT 4
-#define CONTROL_RATE_PROFILE_COUNT  4
+#ifndef CONTROL_RATE_PROFILE_COUNT
+#define CONTROL_RATE_PROFILE_COUNT 4 // or maybe 6
+#endif
 
 #define USE_CLI_BATCH
 #define USE_RESOURCE_MGMT
diff --git a/src/test/unit/platform.h b/src/test/unit/platform.h
index d7d5eb505e..dd03dce802 100644
--- a/src/test/unit/platform.h
+++ b/src/test/unit/platform.h
@@ -43,7 +43,7 @@
 
 
 #define PID_PROFILE_COUNT 4
-#define CONTROL_RATE_PROFILE_COUNT  4
+#define CONTROL_RATE_PROFILE_COUNT 4
 #define USE_MAG
 #define USE_BARO
 #define USE_GPS