diff --git a/test/sensor_simulator/baro.cpp b/test/sensor_simulator/baro.cpp
index 7915b2719a..0a0d7a9efb 100644
--- a/test/sensor_simulator/baro.cpp
+++ b/test/sensor_simulator/baro.cpp
@@ -16,7 +16,6 @@ Baro::~Baro()
 void Baro::send(uint32_t time)
 {
 	_ekf->setBaroData(time,_baro_data);
-	_time_last_data_sent = time;
 }
 
 void Baro::setData(float baro)
diff --git a/test/sensor_simulator/imu.cpp b/test/sensor_simulator/imu.cpp
index a15c6f6117..0360a64fdb 100644
--- a/test/sensor_simulator/imu.cpp
+++ b/test/sensor_simulator/imu.cpp
@@ -24,7 +24,6 @@ void Imu::send(uint32_t time)
 	imu_sample.delta_vel = _accel_data * imu_sample.delta_vel_dt;
 
 	_ekf->setIMUData(imu_sample);
-	_time_last_data_sent = time;
 }
 
 void Imu::setData(const Vector3f& accel, const Vector3f& gyro)
diff --git a/test/sensor_simulator/mag.cpp b/test/sensor_simulator/mag.cpp
index 32734bf7a4..07af125b09 100644
--- a/test/sensor_simulator/mag.cpp
+++ b/test/sensor_simulator/mag.cpp
@@ -18,7 +18,6 @@ void Mag::send(uint32_t time)
 	float mag[3];
 	_mag_data.copyTo(mag);
 	_ekf->setMagData(time,mag);
-	_time_last_data_sent = time;
 }
 
 void Mag::setData(const Vector3f& mag)
diff --git a/test/sensor_simulator/sensor.cpp b/test/sensor_simulator/sensor.cpp
index 80b8e281bc..c0506340f1 100644
--- a/test/sensor_simulator/sensor.cpp
+++ b/test/sensor_simulator/sensor.cpp
@@ -16,6 +16,7 @@ void Sensor::update(uint32_t time)
 	if(should_send(time))
 	{
 		send(time);
+		_time_last_data_sent = time;
 	}
 }