diff --git a/src/shared/condition.c b/src/shared/condition.c
index d4d9eacc4b..b86312548d 100644
--- a/src/shared/condition.c
+++ b/src/shared/condition.c
@@ -675,6 +675,11 @@ static int condition_test_needs_update(Condition *c, char **env) {
         if (r > 0)
                 return b;
 
+        if (in_initrd()) {
+                log_debug("We are in an initrd, not doing any updates.");
+                return false;
+        }
+
         if (!path_is_absolute(c->parameter)) {
                 log_debug("Specified condition parameter '%s' is not absolute, assuming an update is needed.", c->parameter);
                 return true;
diff --git a/units/proc-sys-fs-binfmt_misc.automount b/units/proc-sys-fs-binfmt_misc.automount
index a71e249976..172c8757ab 100644
--- a/units/proc-sys-fs-binfmt_misc.automount
+++ b/units/proc-sys-fs-binfmt_misc.automount
@@ -13,6 +13,7 @@ Documentation=https://www.kernel.org/doc/html/latest/admin-guide/binfmt-misc.htm
 Documentation=https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems
 DefaultDependencies=no
 Before=sysinit.target
+Conflicts=shutdown.target
 ConditionPathExists=/proc/sys/fs/binfmt_misc/
 ConditionPathIsReadWrite=/proc/sys/