diff --git a/20-grub.install b/20-grub.install
index 0ecf1e2..636661d 100755
--- a/20-grub.install
+++ b/20-grub.install
@@ -109,7 +109,7 @@ case "$COMMAND" in
             if ( [[ "$KERNEL_VERSION" != *${GRUB_DEFAULT_KERNEL_TYPE}* ]] && \
                      [ "x$GRUB_NON_STANDARD_KERNEL" == "xtrue" ] ) || \
                    ( echo "$KERNEL_VERSION" | grep -E -q "64k|auto|rt|uki" && \
-                    	[ "x$GRUB_NON_STANDARD_KERNEL" != "xtrue" ] ) || \
+                        [ "x$GRUB_NON_STANDARD_KERNEL" != "xtrue" ] ) || \
                    ( [[ "$KERNEL_VERSION" == *debug* ]] && [ "x$GRUB_DEFAULT_TO_DEBUG" != "xtrue" ] ); then
                 GRUB_UPDATE_DEFAULT_KERNEL=false
             fi
diff --git a/grub2.spec b/grub2.spec
index 75dbe17..e89560b 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -7,7 +7,7 @@
 Name:		grub2
 Epoch:		1
 Version:	2.02
-Release:	170%{?dist}.2
+Release:	170%{?dist}.3
 Summary:	Bootloader with support for Linux, Multiboot and more
 Group:		System Environment/Base
 License:	GPLv3+
@@ -308,8 +308,17 @@ fi
 
 if [ "$1" = 2 ]; then
     if [ -f /etc/default/grub ]; then
-	! grep -q '^GRUB_ENABLE_BLSCFG=.*' /etc/default/grub && \
-	    /sbin/grub2-switch-to-blscfg --backup-suffix=.rpmsave &>/dev/null || :
+        if ! grep -q '^GRUB_ENABLE_BLSCFG=.*' /etc/default/grub ; then
+            if [[ -n $LEAPP_IPU_IN_PROGRESS ]] && [[ $LEAPP_IPU_IN_PROGRESS == 7to8 ]]; then
+                /sbin/grub2-switch-to-blscfg --backup-suffix=.rpmsave &>/dev/null || :
+            elif [[ -f /boot/grub2/grub.cfg ]]; then
+                if grep -q "^insmod blscfg" /boot/grub2/grub.cfg ; then
+                    sed -i '1iGRUB_ENABLE_BLSCFG=true' /etc/default/grub
+                else
+                    sed -i '1iGRUB_ENABLE_BLSCFG=false' /etc/default/grub
+                fi
+            fi
+        fi
     fi
 fi
 
@@ -526,6 +535,10 @@ fi
 %endif
 
 %changelog
+* Wed Jul 08 2026 Marta Lewandowska <mlewando@redhat.com> - 2.02-170.3
+- Unless leapping do not force using BLS if it's not defined
+- Resolves: #RHEL-173826
+
 * Mon May 18 2026 Nicolas Frayer <nfrayer@redhat.com> - 2.02-170.2
 - Bump sbat to grub,5
 - Resolves: #RHEL-177648