diff --git a/companion/src/modeledit/setup.cpp b/companion/src/modeledit/setup.cpp
index ccfd16a37..285a4e3ad 100644
--- a/companion/src/modeledit/setup.cpp
+++ b/companion/src/modeledit/setup.cpp
@@ -249,7 +249,7 @@ void ModulePanel::update()
         break;
       case PULSES_CROSSFIRE:
         mask |= MASK_CHANNELS_RANGE;
-        module.channelsCount = 12;
+        module.channelsCount = 16;
         break;
       case PULSES_PPM:
         mask |= MASK_PPM_FIELDS | MASK_CHANNELS_RANGE| MASK_CHANNELS_COUNT;
diff --git a/radio/src/pulses/pulses_arm.h b/radio/src/pulses/pulses_arm.h
index 460dfed97..821f61f87 100644
--- a/radio/src/pulses/pulses_arm.h
+++ b/radio/src/pulses/pulses_arm.h
@@ -85,8 +85,8 @@ PACK(struct Dsm2PulsesData {
 #endif
 
 #define CROSSFIRE_BAUDRATE             200000
-#define CROSSFIRE_FRAME_LEN            20
-#define CROSSFIRE_CHANNELS_COUNT       12
+#define CROSSFIRE_FRAME_LEN            25
+#define CROSSFIRE_CHANNELS_COUNT       16
 PACK(struct CrossfirePulsesData {
   uint8_t pulses[CROSSFIRE_FRAME_LEN];
 });