diff --git a/overlay/usr/lib/systemd/system/boot-efi.mount b/overlay/usr/lib/systemd/system/boot-efi.mount
index ca3490553c..b407b3bb03 100644
--- a/overlay/usr/lib/systemd/system/boot-efi.mount
+++ b/overlay/usr/lib/systemd/system/boot-efi.mount
@@ -1,7 +1,7 @@
 [Unit]
 Description=EFI System Partition
 Documentation=https://github.com/coreos/fedora-coreos-config
-ConditionPathExists=/boot/efi
+ConditionPathExists=/sys/firmware/efi/efivars
 
 [Mount]
 What=/dev/disk/by-label/EFI-SYSTEM