diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c
index 9c0ec390f1..4ea2523d96 100644
--- a/src/firstboot/firstboot.c
+++ b/src/firstboot/firstboot.c
@@ -928,9 +928,6 @@ static int write_root_passwd(int rfd, int etc_fd, const char *password, const ch
                         .pw_shell = (char *) (shell ?: default_root_shell_at(rfd)),
                 };
 
-                if (errno != ENOENT)
-                        return -errno;
-
                 r = putpwent_sane(&root, passwd);
                 if (r < 0)
                         return r;
@@ -1004,9 +1001,6 @@ static int write_root_shadow(int etc_fd, const char *hashed_password) {
                         .sp_flag = ULONG_MAX, /* this appears to be what everybody does ... */
                 };
 
-                if (errno != ENOENT)
-                        return -errno;
-
                 r = putspent_sane(&root, shadow);
                 if (r < 0)
                         return r;