diff --git a/src/main/config/config.c b/src/main/config/config.c
index 0a0d9466c9..33b60ae73e 100644
--- a/src/main/config/config.c
+++ b/src/main/config/config.c
@@ -139,7 +139,7 @@ static uint32_t activeFeaturesLatch = 0;
 static uint8_t currentControlRateProfileIndex = 0;
 controlRateConfig_t *currentControlRateProfile;
 
-static const uint8_t EEPROM_CONF_VERSION = 100;
+static const uint8_t EEPROM_CONF_VERSION = 101;
 
 static void resetAccelerometerTrims(flightDynamicsTrims_t *accelerometerTrims)
 {
diff --git a/src/main/io/rc_controls.h b/src/main/io/rc_controls.h
index dd5a387d92..61b9c71b08 100644
--- a/src/main/io/rc_controls.h
+++ b/src/main/io/rc_controls.h
@@ -84,12 +84,7 @@ typedef enum {
 #define THR_CE (3 << (2 * THROTTLE))
 #define THR_HI (2 << (2 * THROTTLE))
 
-#define MAX_MODE_ACTIVATION_CONDITION_COUNT 40
-// 40 is enough for 1 mode for each position of 11 * 3 position switches and a 6 pos switch.
-// however, that is unlikely because you don't define the 'off' positions, so for a 3 position
-// switch it's normal that only 2 values would be configured.
-// this leaves plenty of 'slots' free for cases where you enable multiple modes for a switch
-// position (like gps rth + horizon + baro + beeper)
+#define MAX_MODE_ACTIVATION_CONDITION_COUNT 20
 
 #define CHANNEL_RANGE_MIN 900
 #define CHANNEL_RANGE_MAX 2100