diff --git a/99-grub-mkconfig.install b/99-grub-mkconfig.install
index d9686b5..2c7faad 100755
--- a/99-grub-mkconfig.install
+++ b/99-grub-mkconfig.install
@@ -40,14 +40,17 @@ if [[ $DISABLE_BLS = "true" ]]; then
     fi
 fi
 
+[ -f /etc/default/grub ] && . /etc/default/grub
+if [ x$GRUB_ENABLE_BLSCFG = xfalse ]; then
+   RUN_MKCONFIG=true
+fi
+
 # A traditional grub configuration file needs to be generated only in the case when
 # the bootloaders are not capable of populating a menu entry from the BLS fragments.
 if [[ $RUN_MKCONFIG != "true" ]]; then
     exit 0
 fi
 
-[[ -f /etc/default/grub ]] && . /etc/default/grub
-
 COMMAND="$1"
 
 case "$COMMAND" in
diff --git a/grub2.spec b/grub2.spec
index 025bc97..7da6827 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -14,7 +14,7 @@
 Name:		grub2
 Epoch:		1
 Version:	2.06
-Release:	22%{?dist}
+Release:	23%{?dist}
 Summary:	Bootloader with support for Linux, Multiboot and more
 License:	GPLv3+
 URL:		http://www.gnu.org/software/grub/
@@ -530,6 +530,10 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg
 %endif
 
 %changelog
+* Fri Feb 18 2022 Robbie Harwood <rharwood@redhat.com> - 2.06-23
+- Re-arm GRUB_ENABLE_BLSCFG=false
+- Resolves: #2018331
+
 * Fri Feb 18 2022 Robbie Harwood <rharwood@redhat.com> - 2.06-22
 - Stop building unsupported 32-bit UEFI stuff
 - Resolves: #2038401