diff --git a/ArduPlane/Log.cpp b/ArduPlane/Log.cpp
index 36cc272cd6..90396b410a 100644
--- a/ArduPlane/Log.cpp
+++ b/ArduPlane/Log.cpp
@@ -522,6 +522,7 @@ void Plane::Log_Write_Vehicle_Startup_Messages()
 {
     // only 200(?) bytes are guaranteed by DataFlash
     Log_Write_Startup(TYPE_GROUNDSTART_MSG);
+    DataFlash.Log_Write_Mode(control_mode);
 }
 
 // start a new log
diff --git a/ArduPlane/system.cpp b/ArduPlane/system.cpp
index a2c8958519..9d6e94b3f4 100644
--- a/ArduPlane/system.cpp
+++ b/ArduPlane/system.cpp
@@ -762,11 +762,6 @@ void Plane::change_arm_state(void)
     Log_Arm_Disarm();
     hal.util->set_soft_armed(arming.is_armed() &&
                              hal.util->safety_switch_state() != AP_HAL::Util::SAFETY_DISARMED);
-
-    // log the mode, so the following log is recorded as the correct mode
-    if (should_log(MASK_LOG_MODE)) {
-        DataFlash.Log_Write_Mode(control_mode);
-    }
 }
 
 /*