diff --git a/conf/messages.xml b/conf/messages.xml
index 7068a6c23e..43a7763bd5 100644
--- a/conf/messages.xml
+++ b/conf/messages.xml
@@ -377,7 +377,6 @@
  </message>
 
   <message name="AIRSPEED" id="54">
-    <field name="adc" type="uint16"/>
     <field name="airspeed" type="float" unit="m/s"/>
     <field name="airspeed_sp" type="float" unit="m/s"/>
     <field name="airspeed_cnt" type="float" unit="m/s"/>
diff --git a/sw/airborne/ap_downlink.h b/sw/airborne/ap_downlink.h
index cec122ce1e..d882e68906 100644
--- a/sw/airborne/ap_downlink.h
+++ b/sw/airborne/ap_downlink.h
@@ -195,9 +195,9 @@
 #endif
 
 #ifdef MEASURE_AIRSPEED
-#define PERIODIC_SEND_AIRSPEED(_chan) DOWNLINK_SEND_AIRSPEED (_chan, &adc_airspeed_val,&estimator_airspeed,&estimator_airspeed,&estimator_airspeed,&estimator_airspeed)
+#define PERIODIC_SEND_AIRSPEED(_chan) DOWNLINK_SEND_AIRSPEED (_chan, &estimator_airspeed, &estimator_airspeed, &estimator_airspeed, &estimator_airspeed)
 #elif defined USE_AIRSPEED
-#define PERIODIC_SEND_AIRSPEED(_chan) DOWNLINK_SEND_AIRSPEED (_chan, &adc_airspeed_val,&estimator_airspeed,&v_ctl_auto_airspeed_setpoint,&v_ctl_auto_airspeed_controlled,&v_ctl_auto_groundspeed_setpoint)
+#define PERIODIC_SEND_AIRSPEED(_chan) DOWNLINK_SEND_AIRSPEED (_chan, &estimator_airspeed, &v_ctl_auto_airspeed_setpoint, &v_ctl_auto_airspeed_controlled, &v_ctl_auto_groundspeed_setpoint)
 #else
 #define PERIODIC_SEND_AIRSPEED(_chan) {}
 #endif
diff --git a/sw/airborne/csc/csc_telemetry.h b/sw/airborne/csc/csc_telemetry.h
index aa4d421752..c0b6f987cf 100644
--- a/sw/airborne/csc/csc_telemetry.h
+++ b/sw/airborne/csc/csc_telemetry.h
@@ -132,7 +132,7 @@ DOWNLINK_SEND_INS3(_chan,     \
 
 #ifdef USE_AIRSPEED
 #include "estimator.h"
-#define PERIODIC_SEND_AIRSPEED(_chan) { float empty; DOWNLINK_SEND_AIRSPEED (_chan, &adc_airspeed_val,&estimator_airspeed,&empty,&empty,&empty,&empty) }
+#define PERIODIC_SEND_AIRSPEED(_chan) { float empty; DOWNLINK_SEND_AIRSPEED (_chan, &estimator_airspeed,&empty,&empty,&empty,&empty) }
 #else
 #define PERIODIC_SEND_AIRSPEED(_chan) {}
 #endif