diff --git a/target/linux/bcm27xx/base-files/etc/diag.sh b/target/linux/bcm27xx/base-files/etc/diag.sh
index 92d72bea11b..601448fbe31 100644
--- a/target/linux/bcm27xx/base-files/etc/diag.sh
+++ b/target/linux/bcm27xx/base-files/etc/diag.sh
@@ -6,26 +6,11 @@
 . /lib/functions/leds.sh
 
 set_state() {
-	case "$(board_name)" in
-	raspberrypi,2-model-b |\
-	raspberrypi,2-model-b-rev2 |\
-	raspberrypi,3-model-b |\
-	raspberrypi,3-model-b-plus |\
-	raspberrypi,400 |\
-	raspberrypi,4-compute-module |\
-	raspberrypi,4-model-b |\
-	raspberrypi,5-model-b |\
-	raspberrypi,model-b-plus)
-		status_led="led1"
-		;;
-	raspberrypi,3-compute-module |\
-	raspberrypi,model-b |\
-	raspberrypi,model-zero |\
-	raspberrypi,model-zero-2 |\
-	raspberrypi,model-zero-w)
-		status_led="led0"
-		;;
-	esac
+	if [ -d "/sys/class/leds/PWR" ]; then
+		status_led="PWR"
+	else
+		status_led="ACT"
+	fi
 
 	case "$1" in
 	preinit)
@@ -37,6 +22,9 @@ set_state() {
 	preinit_regular)
 		status_led_blink_preinit_regular
 		;;
+        upgrade)
+                status_led_blink_preinit_regular
+                ;;
 	done)
 		status_led_on
 		;;