diff --git a/target/linux/apm821xx/base-files/etc/diag.sh b/target/linux/apm821xx/base-files/etc/diag.sh
index 26c035c6f3..96d42a4892 100755
--- a/target/linux/apm821xx/base-files/etc/diag.sh
+++ b/target/linux/apm821xx/base-files/etc/diag.sh
@@ -29,9 +29,11 @@ set_state() {
 		;;
 	upgrade)
 		[ -n "$running" ] && {
-			status_led="$upgrade"
-			status_led_blink_preinit_regular
+			status_led="$running"
+			status_led_off
 		}
+		status_led="$upgrade"
+		status_led_blink_preinit_regular
 		;;
 	done)
 		status_led_off
diff --git a/target/linux/ath79/base-files/etc/diag.sh b/target/linux/ath79/base-files/etc/diag.sh
index a3a7047702..782bab907a 100755
--- a/target/linux/ath79/base-files/etc/diag.sh
+++ b/target/linux/ath79/base-files/etc/diag.sh
@@ -32,9 +32,11 @@ set_state() {
 		;;
 	upgrade)
 		[ -n "$running" ] && {
-			status_led="$upgrade"
-			status_led_blink_preinit_regular
+			status_led="$running"
+			status_led_off
 		}
+		status_led="$upgrade"
+		status_led_blink_preinit_regular
 		;;
 	done)
 		status_led_off
diff --git a/target/linux/ipq40xx/base-files/etc/diag.sh b/target/linux/ipq40xx/base-files/etc/diag.sh
index a3a7047702..782bab907a 100755
--- a/target/linux/ipq40xx/base-files/etc/diag.sh
+++ b/target/linux/ipq40xx/base-files/etc/diag.sh
@@ -32,9 +32,11 @@ set_state() {
 		;;
 	upgrade)
 		[ -n "$running" ] && {
-			status_led="$upgrade"
-			status_led_blink_preinit_regular
+			status_led="$running"
+			status_led_off
 		}
+		status_led="$upgrade"
+		status_led_blink_preinit_regular
 		;;
 	done)
 		status_led_off
diff --git a/target/linux/ipq806x/base-files/etc/diag.sh b/target/linux/ipq806x/base-files/etc/diag.sh
index df4afd936c..9e6b4918ed 100755
--- a/target/linux/ipq806x/base-files/etc/diag.sh
+++ b/target/linux/ipq806x/base-files/etc/diag.sh
@@ -29,9 +29,11 @@ set_state() {
 		;;
 	upgrade)
 		[ -n "$running" ] && {
-			status_led="$upgrade"
-			status_led_blink_preinit_regular
+			status_led="$running"
+			status_led_off
 		}
+		status_led="$upgrade"
+		status_led_blink_preinit_regular
 		;;
 	done)
 		status_led_off