diff --git a/src/modules/systemlib/battery.cpp b/src/modules/systemlib/battery.cpp
index 0237dee700..b398a7370a 100644
--- a/src/modules/systemlib/battery.cpp
+++ b/src/modules/systemlib/battery.cpp
@@ -163,10 +163,11 @@ void
 Battery::determineWarning()
 {
 	// TODO: Determine threshold or make params.
-	if (_remaining < 0.18f) {
-		_warning = battery_status_s::BATTERY_WARNING_LOW;
 
-	} else if (_remaining < 0.09f) {
+	// Smallest values must come first
+	if (_remaining < 0.09f) {
 		_warning = battery_status_s::BATTERY_WARNING_CRITICAL;
+	} else if (_remaining < 0.18f) {
+		_warning = battery_status_s::BATTERY_WARNING_LOW;
 	}
 }