diff --git a/20-grub.install b/20-grub.install
index a3f1b18..492c9ac 100755
--- a/20-grub.install
+++ b/20-grub.install
@@ -175,8 +175,9 @@ case "$COMMAND" in
 
         if [[ "x${GRUB_ENABLE_BLSCFG}" = "xtrue" ]] || [[ ! -f /sbin/new-kernel-pkg ]]; then
             BLS_TARGET="${BLS_DIR}/${MACHINE_ID}-${KERNEL_VERSION}.conf"
+            BLS_FAKE_TARGET="${BLS_DIR}/ffffffffffffffffffffffffffffffff-${KERNEL_VERSION}.conf"
             BLS_DEBUG="$(echo ${BLS_TARGET} | sed -e "s/${KERNEL_VERSION}/${KERNEL_VERSION}~debug/")"
-            rm -f "${BLS_TARGET}" "${BLS_DEBUG}"
+            rm -f "${BLS_TARGET}" "${BLS_DEBUG}" "${BLS_FAKE_TARGET}"
 
             for i in vmlinuz System.map config zImage.stub dtb; do
                 rm -rf "/boot/${i}-${KERNEL_VERSION}"
diff --git a/grub2.spec b/grub2.spec
index f560036..95161a4 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -16,7 +16,7 @@
 Name:		grub2
 Epoch:		1
 Version:	2.06
-Release:	106%{?dist}
+Release:	107%{?dist}
 Summary:	Bootloader with support for Linux, Multiboot and more
 License:	GPLv3+
 URL:		http://www.gnu.org/software/grub/
@@ -547,6 +547,10 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg
 %endif
 
 %changelog
+* Wed May 14 2025 Nicolas Frayer <nfrayer@redhat.com> - 2.06-107
+- Remove BLS fake config in case of kernel removal
+- Resolves: #RHEL-83915
+
 * Wed May 14 2025 Nicolas Frayer <nfrayer@redhat.com> - 2.06-106
 - sbat: bump grub sbat for new shim release
 - Resolves: #RHEL-91278