diff --git a/src/modules/commander/commander.cpp b/src/modules/commander/commander.cpp
index 99bbb9e725..74b7c07a97 100644
--- a/src/modules/commander/commander.cpp
+++ b/src/modules/commander/commander.cpp
@@ -2032,7 +2032,9 @@ int commander_thread_main(int argc, char *argv[])
 					}
 
 					// Provide feedback on mission state
-					if (!_mission_result.valid && hotplug_timeout && _home.timestamp > 0) {
+					if ((_mission_result.timestamp > commander_boot_timestamp) && hotplug_timeout &&
+						(_mission_result.instance_count > 0) && !_mission_result.valid) {
+
 						mavlink_log_critical(&mavlink_log_pub, "Planned mission fails check. Please upload again.");
 					}
 				}