diff --git a/.grubby.metadata b/.grubby.metadata
new file mode 100644
index 0000000..6085fc6
--- /dev/null
+++ b/.grubby.metadata
@@ -0,0 +1 @@
+97ae8d113b74538c05f05083dcff4f44012fd0cd SOURCES/8.40-1.tar.gz
diff --git a/SOURCES/grubby-bls b/SOURCES/grubby-bls
index 07df5c8..2dd51f2 100755
--- a/SOURCES/grubby-bls
+++ b/SOURCES/grubby-bls
@@ -85,7 +85,7 @@ get_bls_values() {
     count=0
     local -a files
     local IFS=$'\n'
-    files=($(for bls in ${blsdir}/*.conf ; do
+    files=($(for bls in ${blsdir}/${MACHINE_ID}*.conf ; do
         if ! [[ -e "${bls}" ]] ; then
             continue
         fi
@@ -94,6 +94,17 @@ get_bls_values() {
         echo "${bls}"
     done | /usr/libexec/grubby/rpm-sort -c rpmnvrcmp 2>/dev/null | tac)) || :
 
+    if [[ -z ${files} ]]; then
+        files=($(for bls in ${blsdir}/*.conf ; do
+            if ! [[ -e "${bls}" ]] ; then
+                continue
+            fi
+            bls="${bls%.conf}"
+            bls="${bls##*/}"
+            echo "${bls}"
+        done | /usr/libexec/grubby/rpm-sort -c rpmnvrcmp 2>/dev/null | tac)) || :
+    fi
+
     for bls in "${files[@]}" ; do
         blspath="${blsdir}/${bls}.conf"
         bls_file[$count]="${blspath}"
diff --git a/SPECS/grubby.spec b/SPECS/grubby.spec
index 878b99d..a35583a 100644
--- a/SPECS/grubby.spec
+++ b/SPECS/grubby.spec
@@ -1,6 +1,6 @@
 Name: grubby
 Version: 8.40
-Release: 49%{?dist}
+Release: 51%{?dist}
 Summary: Command line tool for updating BootLoaderSpec files
 License: GPLv2+
 URL: https://github.com/rhinstaller/grubby
@@ -169,6 +169,14 @@ current boot environment.
 %{_mandir}/man8/*.8*
 
 %changelog
+* Thu Jul 23 2026 Marta Lewandowska <mlewando@redhat.com> - 8.40-51
+- Have grubby only manipulate relevant entries, fallback if empty
+- Resolves: #RHEL-132931
+
+* Fri Jul 03 2026 Marta Lewandowska <mlewando@redhat.com> - 8.40-50
+- Have grubby only manipulate and display relevant entries
+- Resolves: #RHEL-132931
+
 * Wed Jan 10 2024 Marta Lewandowska <mlewando@redhat.com> - 8.40-49
 - Do not overwrite all vars that start with GRUB_CMDLINE_LINUX
 - Resolves: #RHEL-12853