diff --git a/build_library/grub.cfg b/build_library/grub.cfg
index a2df9f8d29..b41cb1beba 100644
--- a/build_library/grub.cfg
+++ b/build_library/grub.cfg
@@ -88,11 +88,13 @@ if [ -z "$linux_console" ]; then
     fi
 fi
 
+set suf=""
+
 # UEFI uses linuxefi/initrdefi instead of linux/initrd except for arm64
-if [ "$grub_platform" = efi ] && [ "$grub_cpu" != arm64 ]; then
+if [ "$grub_platform" = efi ]; then
+  if [ "$grub_cpu" != arm64 ]; then
     set suf="efi"
-else
-    set suf=""
+  fi
 fi
 
 # Assemble the options applicable to all the kernels below