diff --git a/scripts/build/chroot_firmware b/scripts/build/chroot_firmware
index e22068f1c..4d8613fdf 100755
--- a/scripts/build/chroot_firmware
+++ b/scripts/build/chroot_firmware
@@ -54,9 +54,17 @@ Check_package host /usr/bin/wget wget
 FIRMWARE_PACKAGES=""
 
 # Manually add firmware-linux meta package if available
-if [ $(apt-cache show "^firmware-linux$" 2> /dev/null | grep "^Package:" | wc -l) -eq 1 ]
+if [ "${LB_BUILD_WITH_CHROOT}" = "true" ]
 then
-	FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} firmware-linux"
+	if [ $(Chroot chroot apt-cache show "^firmware-linux$" 2> /dev/null | grep "^Package:" | wc -l) -eq 1 ]
+	then
+		FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} firmware-linux"
+	fi
+else
+	if [ $(apt-cache show "^firmware-linux$" 2> /dev/null | grep "^Package:" | wc -l) -eq 1 ]
+	then
+		FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} firmware-linux"
+	fi
 fi
 
 Firmware_List_From_Contents "${LB_PARENT_MIRROR_CHROOT}" "${LB_PARENT_DISTRIBUTION_CHROOT}" "${LB_PARENT_ARCHIVE_AREAS}"
diff --git a/scripts/build/installer_debian-installer b/scripts/build/installer_debian-installer
index c28b51610..9f0a7af18 100755
--- a/scripts/build/installer_debian-installer
+++ b/scripts/build/installer_debian-installer
@@ -402,9 +402,17 @@ then
 		FIRMWARE_PACKAGES=""
 
 		# Manually add firmware-linux meta package if available
-		if [ $(apt-cache show "^firmware-linux$" 2> /dev/null | grep "^Package:" | wc -l) -eq 1 ]
+		if [ "${LB_BUILD_WITH_CHROOT}" = "true" ]
 		then
-			FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} firmware-linux"
+			if [ $(Chroot chroot apt-cache show "^firmware-linux$" 2> /dev/null | grep "^Package:" | wc -l) -eq 1 ]
+			then
+				FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} firmware-linux"
+			fi
+		else
+			if [ $(apt-cache show "^firmware-linux$" 2> /dev/null | grep "^Package:" | wc -l) -eq 1 ]
+			then
+				FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} firmware-linux"
+			fi
 		fi
 
 		Firmware_List_From_Contents "${LB_PARENT_MIRROR_CHROOT}" "${LB_PARENT_DISTRIBUTION_CHROOT}" "${LB_PARENT_ARCHIVE_AREAS}"