diff --git a/overlay.d/05core/usr/lib/dracut/modules.d/30ignition-coreos/coreos-boot-edit.service b/overlay.d/05core/usr/lib/dracut/modules.d/30ignition-coreos/coreos-boot-edit.service
index d12ec05ba5..fb26c19c73 100644
--- a/overlay.d/05core/usr/lib/dracut/modules.d/30ignition-coreos/coreos-boot-edit.service
+++ b/overlay.d/05core/usr/lib/dracut/modules.d/30ignition-coreos/coreos-boot-edit.service
@@ -8,7 +8,13 @@ ConditionPathExists=/usr/lib/initrd-release
 OnFailure=emergency.target
 OnFailureJobMode=isolate
 
-# Since we are mounting /boot, require the device first
+# These are the conditions for which we may need to modify /boot. Otherwise,
+# let's avoid mounting it entirely.
+# Currently, we only have one trigger.
+ConditionPathExists=|/run/coreos-copy-firstboot-network.stamp
+
+# Since we are mounting /boot, require the device first. This isn't strictly
+# necessary since we run late, but on principle let's make clear the dependency.
 Requires=dev-disk-by\x2dlabel-boot.device
 After=dev-disk-by\x2dlabel-boot.device
 # Start after Ignition has finished