diff --git a/ironic_python_agent/extensions/image.py b/ironic_python_agent/extensions/image.py
index a4edfb093..4f3299036 100644
--- a/ironic_python_agent/extensions/image.py
+++ b/ironic_python_agent/extensions/image.py
@@ -82,6 +82,8 @@ def _install_grub2(device, root_uuid, efi_system_part_uuid=None):
     """Install GRUB2 bootloader on a given device."""
     LOG.debug("Installing GRUB2 bootloader on device %s", device)
     root_partition = _get_partition(device, uuid=root_uuid)
+    efi_partition = None
+    efi_partition_mount_point = None
 
     try:
         # Mount the partition and binds
@@ -90,9 +92,6 @@ def _install_grub2(device, root_uuid, efi_system_part_uuid=None):
         if efi_system_part_uuid:
             efi_partition = _get_partition(device, uuid=efi_system_part_uuid)
             efi_partition_mount_point = os.path.join(path, "boot/efi")
-        else:
-            efi_partition = None
-            efi_partition_mount_point = None
 
         utils.execute('mount', root_partition, path)
         for fs in BIND_MOUNTS: