diff --git a/libraries/AP_KDECAN/AP_KDECAN.cpp b/libraries/AP_KDECAN/AP_KDECAN.cpp
index ea82a4f82a..344b69f822 100644
--- a/libraries/AP_KDECAN/AP_KDECAN.cpp
+++ b/libraries/AP_KDECAN/AP_KDECAN.cpp
@@ -606,7 +606,7 @@ bool AP_KDECAN::pre_arm_check(char* reason, uint8_t reason_len)
 
     _enum_sem.give();
 
-    uint16_t motors_mask = 0;
+    uint32_t motors_mask = 0;
     AP_Motors *motors = AP_Motors::get_singleton();
 
     if (motors) {
diff --git a/libraries/AP_KDECAN/AP_KDECAN.h b/libraries/AP_KDECAN/AP_KDECAN.h
index 3664067f69..39264e4c67 100644
--- a/libraries/AP_KDECAN/AP_KDECAN.h
+++ b/libraries/AP_KDECAN/AP_KDECAN.h
@@ -72,7 +72,7 @@ private:
     AP_Int8 _num_poles;
 
     // ESC detected information
-    uint16_t _esc_present_bitmask;
+    uint32_t _esc_present_bitmask;
     uint8_t _esc_max_node_id;
 
     // enumeration