diff --git a/APMrover2/APMrover2.pde b/APMrover2/APMrover2.pde
index 97eaf5405f..6c12d49527 100644
--- a/APMrover2/APMrover2.pde
+++ b/APMrover2/APMrover2.pde
@@ -832,6 +832,10 @@ static void update_GPS(void)
 
 			} else {
                 init_home();
+
+                // set system clock for log timestamps
+                hal.util->set_system_clock(g_gps->time_epoch_usec());
+
 				if (g.compass_enabled) {
 					// Set compass declination automatically
 					compass.set_initial_location(g_gps->latitude, g_gps->longitude);