diff --git a/src/modules/commander/HealthAndArmingChecks/checks/batteryCheck.cpp b/src/modules/commander/HealthAndArmingChecks/checks/batteryCheck.cpp
index 0ac49e7a81..daba5b5006 100644
--- a/src/modules/commander/HealthAndArmingChecks/checks/batteryCheck.cpp
+++ b/src/modules/commander/HealthAndArmingChecks/checks/batteryCheck.cpp
@@ -240,7 +240,7 @@ void BatteryChecks::checkAndReport(const Context &context, Report &reporter)
 						    log_level, "Critical battery");
 
 			if (reporter.mavlink_log_pub()) {
-				mavlink_log_warning(reporter.mavlink_log_pub(), "Critical battery\t");
+				mavlink_log_critical(reporter.mavlink_log_pub(), "Critical battery\t");
 			}
 
 			break;
diff --git a/src/modules/commander/failsafe/framework.cpp b/src/modules/commander/failsafe/framework.cpp
index bdfe9fed97..9e5b1bc62b 100644
--- a/src/modules/commander/failsafe/framework.cpp
+++ b/src/modules/commander/failsafe/framework.cpp
@@ -238,8 +238,6 @@ void FailsafeBase::notifyUser(uint8_t user_intended_mode, Action action, Action
 				{events::Log::Critical, events::LogInternal::Warning},
 				"Failsafe activated: Autopilot disengaged, switching to {2}", mavlink_mode, failsafe_action);
 
-				mavlink_log_critical(&_mavlink_log_pub, "Failsafe activated\t");
-
 			} else {
 				/* EVENT
 				* @type append_health_and_arming_messages
@@ -248,8 +246,6 @@ void FailsafeBase::notifyUser(uint8_t user_intended_mode, Action action, Action
 					events::ID("commander_failsafe_enter_generic"),
 				{events::Log::Critical, events::LogInternal::Warning},
 				"Failsafe activated: switching to {2}", mavlink_mode, failsafe_action);
-
-				mavlink_log_critical(&_mavlink_log_pub, "Failsafe activated\t");
 			}
 
 		} else {
@@ -291,13 +287,15 @@ void FailsafeBase::notifyUser(uint8_t user_intended_mode, Action action, Action
 					events::ID("commander_failsafe_enter"),
 				{events::Log::Critical, events::LogInternal::Warning},
 				"{3}: switching to {2}", mavlink_mode, failsafe_action, failsafe_cause);
-
-				mavlink_log_critical(&_mavlink_log_pub, "Failsafe activated\t");
 			}
 		}
 
+		if (action != Action::Warn) {
+			mavlink_log_critical(&_mavlink_log_pub, "Failsafe activated\t");
+		};
 	}
 
+
 #endif /* EMSCRIPTEN_BUILD */
 }