diff --git a/common/autoboot.c b/common/autoboot.c
index 6d78716a266a0e766b523954257c27591225cd68..74f97a0513729c1e013d86d7926604cf628d3091 100644
--- a/common/autoboot.c
+++ b/common/autoboot.c
@@ -363,7 +363,8 @@ void autoboot_command(const char *s)
 {
 	debug("### main_loop: bootcmd=\"%s\"\n", s ? s : "<UNDEFINED>");
 
-	if (stored_bootdelay != -1 && s && !abortboot(stored_bootdelay)) {
+	if (s && (stored_bootdelay == -2 ||
+		 (stored_bootdelay != -1 && !abortboot(stored_bootdelay)))) {
 		bool lock;
 		int prev;