diff --git a/conf/airframes/ENAC/fixed-wing/jp.xml b/conf/airframes/ENAC/fixed-wing/jp.xml
index f45d560046..888a767be8 100644
--- a/conf/airframes/ENAC/fixed-wing/jp.xml
+++ b/conf/airframes/ENAC/fixed-wing/jp.xml
@@ -11,7 +11,6 @@
       <configure name="ADC_AIRSPEED" value="ADC_1"/>
       <define name="AIRSPEED_ADC_QUADRATIC_SCALE" value="0.5"/>
       <define name="AIRSPEED_ADC_BIAS" value="430"/>
-      <define name="MEASURE_AIRSPEED"/>
     </load>
     <load name="gps_ubx_ucenter.xml"/>
     <!--load name="sys_mon.xml"/-->
diff --git a/sw/airborne/firmwares/fixedwing/autopilot.c b/sw/airborne/firmwares/fixedwing/autopilot.c
index 7adf3249c9..825e55dd34 100644
--- a/sw/airborne/firmwares/fixedwing/autopilot.c
+++ b/sw/airborne/firmwares/fixedwing/autopilot.c
@@ -150,13 +150,13 @@ static void send_desired(struct transport_tx *trans, struct link_device *dev)
 static void send_airspeed(struct transport_tx *trans __attribute__((unused)),
                           struct link_device *dev __attribute__((unused)))
 {
-#ifdef MEASURE_AIRSPEED
-  float *airspeed = stateGetAirspeed_f();
-  pprz_msg_send_AIRSPEED(trans, dev, AC_ID, airspeed, airspeed, airspeed, airspeed);
-#elif USE_AIRSPEED
+#if USE_AIRSPEED
   pprz_msg_send_AIRSPEED(trans, dev, AC_ID,
                          stateGetAirspeed_f(), &v_ctl_auto_airspeed_setpoint,
                          &v_ctl_auto_airspeed_controlled, &v_ctl_auto_groundspeed_setpoint);
+#else
+  float zero = 0;
+  pprz_msg_send_AIRSPEED(trans, dev, AC_ID, stateGetAirspeed_f(), &zero, &zero, &zero);
 #endif
 }