diff --git a/src/basic/mkdir.c b/src/basic/mkdir.c
index 3b7cf7a0bf..41af1482bc 100644
--- a/src/basic/mkdir.c
+++ b/src/basic/mkdir.c
@@ -33,11 +33,8 @@ int mkdirat_safe_internal(
         assert(_mkdirat && _mkdirat != mkdirat);
 
         r = _mkdirat(dir_fd, path, mode);
-        if (r >= 0) {
-                r = chmod_and_chown_at(dir_fd, path, mode, uid, gid);
-                if (r < 0)
-                        return r;
-        }
+        if (r >= 0)
+                return chmod_and_chown_at(dir_fd, path, mode, uid, gid);
         if (r != -EEXIST)
                 return r;