diff --git a/flight/targets/boards/coptercontrol/pios_board.h b/flight/targets/boards/coptercontrol/pios_board.h
index c19dfb0c5..89ee3c9b7 100644
--- a/flight/targets/boards/coptercontrol/pios_board.h
+++ b/flight/targets/boards/coptercontrol/pios_board.h
@@ -231,7 +231,7 @@ extern uint32_t pios_com_msp_id;
 // Receiver PPM input
 // -------------------------
 #define PIOS_PPM_MAX_DEVS            1
-#define PIOS_PPM_NUM_INPUTS          12
+#define PIOS_PPM_NUM_INPUTS          16
 
 // -------------------------
 // Receiver PWM input
diff --git a/flight/targets/boards/discoveryf4bare/pios_board.h b/flight/targets/boards/discoveryf4bare/pios_board.h
index 80074241a..13121f557 100644
--- a/flight/targets/boards/discoveryf4bare/pios_board.h
+++ b/flight/targets/boards/discoveryf4bare/pios_board.h
@@ -219,7 +219,7 @@ extern uint32_t pios_packet_handler;
 // Receiver PPM input
 // -------------------------
 #define PIOS_PPM_MAX_DEVS            1
-#define PIOS_PPM_NUM_INPUTS          12
+#define PIOS_PPM_NUM_INPUTS          16
 
 // -------------------------
 // Receiver PWM input
diff --git a/flight/targets/boards/revolution/pios_board.h b/flight/targets/boards/revolution/pios_board.h
index 29892fe53..dee6582e6 100644
--- a/flight/targets/boards/revolution/pios_board.h
+++ b/flight/targets/boards/revolution/pios_board.h
@@ -240,7 +240,7 @@ extern uint32_t pios_packet_handler;
 // Receiver PPM input
 // -------------------------
 #define PIOS_PPM_MAX_DEVS            1
-#define PIOS_PPM_NUM_INPUTS          12
+#define PIOS_PPM_NUM_INPUTS          16
 
 // -------------------------
 // Receiver PWM input
diff --git a/flight/targets/boards/revonano/pios_board.h b/flight/targets/boards/revonano/pios_board.h
index c98cfc77a..63e631f86 100644
--- a/flight/targets/boards/revonano/pios_board.h
+++ b/flight/targets/boards/revonano/pios_board.h
@@ -240,7 +240,7 @@ extern uint32_t pios_packet_handler;
 // Receiver PPM input
 // -------------------------
 #define PIOS_PPM_MAX_DEVS            1
-#define PIOS_PPM_NUM_INPUTS          12
+#define PIOS_PPM_NUM_INPUTS          16
 
 // -------------------------
 // Receiver PWM input
diff --git a/flight/targets/boards/revoproto/pios_board.h b/flight/targets/boards/revoproto/pios_board.h
index 171c37f44..83d9bd911 100644
--- a/flight/targets/boards/revoproto/pios_board.h
+++ b/flight/targets/boards/revoproto/pios_board.h
@@ -196,7 +196,7 @@ extern uint32_t pios_com_msp_id;
 // Receiver PPM input
 // -------------------------
 #define PIOS_PPM_MAX_DEVS            1
-#define PIOS_PPM_NUM_INPUTS          12
+#define PIOS_PPM_NUM_INPUTS          16
 
 // -------------------------
 // Receiver PWM input
diff --git a/flight/targets/boards/sparky2/pios_board.h b/flight/targets/boards/sparky2/pios_board.h
index 92454499b..fa0c86f7f 100644
--- a/flight/targets/boards/sparky2/pios_board.h
+++ b/flight/targets/boards/sparky2/pios_board.h
@@ -240,7 +240,7 @@ extern uint32_t pios_packet_handler;
 // Receiver PPM input
 // -------------------------
 #define PIOS_PPM_MAX_DEVS            1
-#define PIOS_PPM_NUM_INPUTS          12
+#define PIOS_PPM_NUM_INPUTS          16
 
 // -------------------------
 // Receiver PWM input
diff --git a/ground/gcs/src/plugins/config/inputchannelform.cpp b/ground/gcs/src/plugins/config/inputchannelform.cpp
index 5a4f20622..535d723b5 100644
--- a/ground/gcs/src/plugins/config/inputchannelform.cpp
+++ b/ground/gcs/src/plugins/config/inputchannelform.cpp
@@ -146,11 +146,11 @@ void InputChannelForm::groupUpdated()
     case ManualControlSettings::CHANNELGROUPS_OPLINK:
         count = 8; // Need to make this 6 for CC
         break;
-    case ManualControlSettings::CHANNELGROUPS_PPM:
     case ManualControlSettings::CHANNELGROUPS_DSMMAINPORT:
     case ManualControlSettings::CHANNELGROUPS_DSMFLEXIPORT:
         count = 12;
         break;
+    case ManualControlSettings::CHANNELGROUPS_PPM:
     case ManualControlSettings::CHANNELGROUPS_SRXL:
     case ManualControlSettings::CHANNELGROUPS_EXBUS:
         count = 16;