diff --git a/src/modules/mavlink/mavlink_timesync.cpp b/src/modules/mavlink/mavlink_timesync.cpp
index c9df0a4126..18746283dc 100644
--- a/src/modules/mavlink/mavlink_timesync.cpp
+++ b/src/modules/mavlink/mavlink_timesync.cpp
@@ -65,6 +65,8 @@ MavlinkTimesync::handle_message(const mavlink_message_t *msg)
 
 				rsync.tc1 = now * 1000ULL;
 				rsync.ts1 = tsync.ts1;
+				rsync.target_component = msg->compid;
+				rsync.target_system = msg->sysid;
 
 				mavlink_msg_timesync_send_struct(_mavlink.get_channel(), &rsync);