diff --git a/src/modules/commander/commander.cpp b/src/modules/commander/commander.cpp
index 95249e50cd..32d091b844 100644
--- a/src/modules/commander/commander.cpp
+++ b/src/modules/commander/commander.cpp
@@ -2929,13 +2929,20 @@ check_valid(hrt_abstime timestamp, hrt_abstime timeout, bool valid_in, bool *val
 void
 control_status_leds(vehicle_status_s *status_local, const actuator_armed_s *actuator_armed, bool changed, battery_status_s *battery_local, const cpuload_s *cpuload_local)
 {
+	bool overload = (cpuload_local->load > 0.75f) || (cpuload_local->ram_usage > 0.98f);
+
 	/* driving rgbled */
 	if (changed) {
 		bool set_normal_color = false;
 		bool hotplug_timeout = hrt_elapsed_time(&commander_boot_timestamp) > HOTPLUG_SENS_TIMEOUT;
 
 		/* set mode */
-		if (status_local->arming_state == vehicle_status_s::ARMING_STATE_ARMED) {
+		if (overload) {
+			rgbled_set_mode(RGBLED_MODE_BLINK_FAST);
+			rgbled_set_color(RGBLED_COLOR_PURPLE);
+			set_normal_color = false;
+
+		} else if (status_local->arming_state == vehicle_status_s::ARMING_STATE_ARMED) {
 			rgbled_set_mode(RGBLED_MODE_ON);
 			set_normal_color = true;
 
@@ -2997,8 +3004,8 @@ control_status_leds(vehicle_status_s *status_local, const actuator_armed_s *actu
 
 #endif
 
-	/* give system warnings on error LED, XXX maybe add memory usage warning too */
-	if (cpuload_local->load > 0.95f) {
+	/* give system warnings on error LED */
+	if (overload) {
 		if (leds_counter % 2 == 0) {
 			led_toggle(LED_AMBER);
 		}
diff --git a/src/modules/load_mon/load_mon.cpp b/src/modules/load_mon/load_mon.cpp
index e4437eab64..88f9fc78bc 100644
--- a/src/modules/load_mon/load_mon.cpp
+++ b/src/modules/load_mon/load_mon.cpp
@@ -178,7 +178,7 @@ void LoadMon::_compute()
 
 float LoadMon::_ram_used()
 {
-#ifdef _PX4_NUTTX
+#ifdef __PX4_NUTTX
 	struct mallinfo mem;
 
 #ifdef CONFIG_CAN_PASS_STRUCTS
@@ -196,8 +196,10 @@ float LoadMon::_ram_used()
 
 	// Check for corruption of the allocation counters
 	if ((mem.arena > CONFIG_DRAM_SIZE) || (mem.fordblks > CONFIG_DRAM_SIZE)) {
-		return 1.0f;
+		load = 1.0f;
 	}
+
+	return load;
 #else
 	return 0.0f;
 #endif