diff --git a/.update/pre-patches b/.update/pre-patches
index a7715faad7..a5dea649f6 100755
--- a/.update/pre-patches
+++ b/.update/pre-patches
@@ -429,5 +429,29 @@ then
 	fi
 fi
 
+# v9.8
+if (( $G_DIETPI_VERSION_CORE < 9 || ( $G_DIETPI_VERSION_CORE == 9 && $G_DIETPI_VERSION_SUB < 8 ) ))
+then
+	# https://dietpi.com/forum/t/20771
+	if (( $G_HW_MODEL == 72 ))
+	then
+		G_DIETPI-NOTIFY 2 'Fix ROCK 4 APT component'
+		if dpkg-query -s 'linux-u-boot-rockpi-4b-current' &> /dev/null
+		then
+			all_components='rock4'
+
+		elif dpkg-query -s 'linux-u-boot-rock-4se-current' &> /dev/null
+		then
+			all_components='rock4se'
+
+		elif dpkg-query -s 'linux-u-boot-rockpi-4cplus-current' &> /dev/null
+		then
+			all_components='rock4cplus'
+		fi
+		G_EXEC sed -i '\|^deb https://dietpi.com/apt all |d' /etc/apt/sources.list.d/dietpi.list
+		G_EXEC eval "echo 'deb https://dietpi.com/apt all $all_components' >> /etc/apt/sources.list.d/dietpi.list"
+	fi
+fi
+
 exit 0
 }
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 55667e20fb..3faa915174 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -8,6 +8,7 @@ Enhancements:
 Bug fixes:
 - NanoPi M3/T3 | Resolved an issue where our recent image did not boot because the bootloader did not define a default device tree path anymore. Many thanks to @rozcietrzewiacz for reporting this issue: https://github.com/MichaIng/DietPi/issues/2630#issuecomment-2322085507
 - NanoPi R5S/R5C | Resolved an issue where the Ethernet LEDs did not work on systems upgraded from the legacy Linux 5.10 kernel. Many thanks to @innovodev for reporting this issue: https://dietpi.com/forum/t/21026
+- ROCK 4 | Resolved an issue where a false APT component was applied for your APT server, leading to errors and missing kernel/firmware upgrades. Many thanks to @cdlenfert for reporting this issue: https://dietpi.com/forum/t/20771
 - DietPi-Services | Resolved an issue where the nfs-kernel-server service did show mode "alias". "nfs-kernel-server" is indeed an alias for the actual service name "nfs-server", which is now used.
 - DietPi-Config | Resolved an issue where username and password in proxy settings could not be cleared, since the inputbox kept asking for an non-empty input. Many thanks to @dipisoft for reporting this issue: https://github.com/MichaIng/DietPi/issues/7211
 - DietPi-Software | NoMachine: Resolved an issue where the installation failed due to an outdated download URL. Many thanks to @tzvi208 for reporting this issue: https://github.com/MichaIng/DietPi/issues/7198
diff --git a/dietpi/func/dietpi-set_software b/dietpi/func/dietpi-set_software
index 5a39ef5324..dc6d7d1fc2 100755
--- a/dietpi/func/dietpi-set_software
+++ b/dietpi/func/dietpi-set_software
@@ -228,12 +228,18 @@ $FP_SCRIPT	rpi_kernel_choice		<empty> Supported on Debian Bookworm or newer on R
 					3) all_components='rock4cplus';;
 					*)
 						[[ -f '/etc/apt/sources.list.d/dietpi.list' ]] && all_components=$(sed -n '/ all /{s/^.* all //p;q}' /etc/apt/sources.list.d/dietpi.list)
-						[[ $all_components ]] || for i in rock{pi-4b,-4se,pi-4cplus}
-						do
-							dpkg-query -s "linux-u-boot-$i-current" &> /dev/null || continue
-							all_components=${i/-//}
-							break
-						done
+						[[ $all_components ]] || if dpkg-query -s 'linux-u-boot-rockpi-4b-current' &> /dev/null
+						then
+							all_components='rock4'
+
+						elif dpkg-query -s 'linux-u-boot-rock-4se-current' &> /dev/null
+						then
+							all_components='rock4se'
+
+						elif dpkg-query -s 'linux-u-boot-rockpi-4cplus-current' &> /dev/null
+						then
+							all_components='rock4cplus'
+						fi
 					;;
 				esac
 			;;