diff --git a/bootstrap.sh b/bootstrap.sh
index a6400f1..8e0f795 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -84,11 +84,12 @@ EOF
 
 [ $MODE == "NVME" ] && suffix="p" || suffix=""
 
-mkfs.fat -F 32 -n P_EFI "/dev/$DEV$suffix1"
 if [ "$ENC" == true ]; then
+    mkfs.fat -I -F 32 -n P_EFI "/dev/$DEV$suffix1" # -I bc of virtual mappings
     crypt_create_fs "/dev/$DEV$suffix3"
     mkfs.ext2 -L cryptswap "/dev/$DEV$suffixp2" 1M # Otherwise label will be lost after reboot
 else
+    mkfs.fat -F 32 -n P_EFI "/dev/$DEV$suffix1" # -I bc of virtual mappings
     mkfs.ext4 -L P_ROOT "/dev/$DEV$suffix3"
     mkswap -L P_SWAP "/dev/$DEV$suffix2"
 fi