diff --git a/firmware/lib/vboot_ui_menu.c b/firmware/lib/vboot_ui_menu.c
index 7c636770c5..b4fdd25ed9 100644
--- a/firmware/lib/vboot_ui_menu.c
+++ b/firmware/lib/vboot_ui_menu.c
@@ -1115,7 +1115,8 @@ static VbError_t recovery_ui(struct vb2_context *ctx, VbCommonParams *cparams)
 				 * there), power button will turn off
 				 * device.
 				 */
-				if (current_menu == VB_MENU_RECOVERY_INSERT) {
+				if (current_menu == VB_MENU_RECOVERY_INSERT ||
+					current_menu == VB_MENU_RECOVERY_NO_GOOD) {
 					ret = VBERROR_SHUTDOWN_REQUESTED;
 				} else {
 					/*