diff --git a/src/boot/bootctl.c b/src/boot/bootctl.c
index 2035fa0d25..86b4d7fd14 100644
--- a/src/boot/bootctl.c
+++ b/src/boot/bootctl.c
@@ -2044,7 +2044,7 @@ static int verb_remove(int argc, char *argv[], void *userdata) {
 
         q = remove_entry_directory(arg_esp_path);
         if (q < 0 && r >= 0)
-                r = 1;
+                r = q;
 
         if (arg_xbootldr_path) {
                 /* Remove the latter two also in the XBOOTLDR partition if it exists */