diff --git a/roles/netbootxyz/defaults/main.yml b/roles/netbootxyz/defaults/main.yml
index 6c36517d14..62b4bcfcf5 100644
--- a/roles/netbootxyz/defaults/main.yml
+++ b/roles/netbootxyz/defaults/main.yml
@@ -714,6 +714,11 @@ utilitiesefi:
     enabled: true
     name: System Rescue CD
     type: ipxemenu
+  zfsbootmenu:
+    enabled: true
+    kernel: ${live_endpoint}{{ endpoints.zfsbootmenu.path }}zfsbootmenu-recovery-x86_64.efi 
+    name: ZFSBootMenu
+    type: direct
 utilitiespcbios32:
   clonezilla:
     enabled: true
diff --git a/roles/netbootxyz/templates/menu/utils-efi.ipxe.j2 b/roles/netbootxyz/templates/menu/utils-efi.ipxe.j2
index 0e6faa9bb1..5d26971a3c 100644
--- a/roles/netbootxyz/templates/menu/utils-efi.ipxe.j2
+++ b/roles/netbootxyz/templates/menu/utils-efi.ipxe.j2
@@ -24,7 +24,9 @@ goto utils_exit
 :{{ key }}
 imgfree
 kernel {{ value.kernel }}
+{% if value.initrd is defined and value.initrd %}
 initrd {{ value.initrd }}
+{% endif %}
 boot
 goto utils_exit
 {% endif %}