diff --git a/blsforme/src/manager.rs b/blsforme/src/manager.rs
index 605d4ad..20e6f81 100644
--- a/blsforme/src/manager.rs
+++ b/blsforme/src/manager.rs
@@ -57,13 +57,17 @@ impl<'a> Manager<'a> {
         let mut mounts = Mounts {
             xbootldr: if let Some(point) = boot_env.xboot_mountpoint.as_ref() {
                 Some(point.clone())
-            } else {
+            } else if boot_env.xbootldr().is_some() {
                 Some(config.root.path().join("boot"))
+            } else {
+                None
             },
             esp: if let Some(point) = boot_env.esp_mountpoint.as_ref() {
                 Some(point.clone())
-            } else {
+            } else if boot_env.esp().is_some() {
                 Some(config.root.path().join("efi"))
+            } else {
+                None
             },
         };