diff --git a/conf/messages.xml b/conf/messages.xml
index a23c1a794d..a303c439fa 100644
--- a/conf/messages.xml
+++ b/conf/messages.xml
@@ -226,7 +226,7 @@
 
  <message name="MOTOR" id="34">
    <field name="rpm" type="uint16" unit="Hz"/>
-   <field name="current" type="uint16" unit="mA"/>
+   <field name="current" type="int32" unit="mA"/>
  </message>
 
  <message name="WP_MOVED" id="35">
@@ -420,7 +420,7 @@
     <field name="rc_status" type="uint8" values="OK|LOST|REALLY_LOST"/>
     <field name="mode" type="uint8" values="MANUAL|AUTO|FAILSAFE"/>
     <field name="vsupply" type="uint8" unit="decivolt"/>
-    <field name="current" type="int16" unit="mA"/>
+    <field name="current" type="int32" unit="mA"/>
   </message>
 
   <message name="ADC" id="104">
diff --git a/sw/airborne/inter_mcu.h b/sw/airborne/inter_mcu.h
index 9d8d15edf4..d82086fbe8 100644
--- a/sw/airborne/inter_mcu.h
+++ b/sw/airborne/inter_mcu.h
@@ -56,7 +56,7 @@ struct fbw_state {
   uint8_t status;
   uint8_t nb_err;
   uint8_t vsupply; 	/* 1e-1 V */
-  int16_t current;	/* milliAmps */
+  int32_t current;	/* milliAmps */
 };
 
 struct ap_state {
diff --git a/sw/airborne/main_ap.c b/sw/airborne/main_ap.c
index 8031cd91bb..28d1d8cb24 100644
--- a/sw/airborne/main_ap.c
+++ b/sw/airborne/main_ap.c
@@ -190,7 +190,7 @@ float slider_1_val, slider_2_val;
 bool_t launch = FALSE;
 
 uint8_t vsupply;	// deciVolt
-static int16_t current;	// milliAmpere
+static int32_t current;	// milliAmpere
 
 float energy; 		// Fuel consumption (mAh)
 
diff --git a/sw/airborne/main_fbw.c b/sw/airborne/main_fbw.c
index 452546aa8e..826602324a 100644
--- a/sw/airborne/main_fbw.c
+++ b/sw/airborne/main_fbw.c
@@ -76,7 +76,7 @@ struct adc_buf current_adc_buf;
 #endif
 
 uint8_t fbw_vsupply_decivolt;
-int16_t fbw_current_milliamp;
+int32_t fbw_current_milliamp;
 
 uint8_t fbw_mode;
 
diff --git a/sw/airborne/main_fbw.h b/sw/airborne/main_fbw.h
index aa4f70ad87..a4be674b32 100644
--- a/sw/airborne/main_fbw.h
+++ b/sw/airborne/main_fbw.h
@@ -41,7 +41,7 @@
 
 extern uint8_t fbw_mode;
 extern uint8_t fbw_vsupply_decivolt;
-extern int16_t fbw_current_milliamp;
+extern int32_t fbw_current_milliamp;
 extern bool_t failsafe_mode;
 
 void init_fbw( void );