diff --git a/firmware/layout2.c b/firmware/layout2.c
index bc9aefe15..bc56f1785 100644
--- a/firmware/layout2.c
+++ b/firmware/layout2.c
@@ -246,14 +246,14 @@ void layoutHome(void)
 			oledDrawBitmap(40, 0, &bmp_logo64);
 		}
 	}
+	if (storage_noBackup()) {
+		oledBox(0, 0, 127, 8, false);
+		oledDrawStringCenter(0, "NO BACKUP!", FONT_STANDARD);
+	} else
 	if (storage_unfinishedBackup()) {
 		oledBox(0, 0, 127, 8, false);
 		oledDrawStringCenter(0, "BACKUP FAILED!", FONT_STANDARD);
 	} else
-	if (storage_noBackup()) {
-		oledBox(0, 0, 127, 8, false);
-		oledDrawStringCenter(0, "NO BACKUP!", FONT_STANDARD);
-	}
 	if (storage_needsBackup()) {
 		oledBox(0, 0, 127, 8, false);
 		oledDrawStringCenter(0, "NEEDS BACKUP!", FONT_STANDARD);
diff --git a/firmware/reset.c b/firmware/reset.c
index 293f4a90f..59b970160 100644
--- a/firmware/reset.c
+++ b/firmware/reset.c
@@ -92,8 +92,7 @@ void reset_entropy(const uint8_t *ext_entropy, uint32_t len)
 	sha256_Final(&ctx, int_entropy);
 	if (no_backup) {
 		storage_setNoBackup();
-	} else
-	if (skip_backup) {
+	} else {
 		storage_setNeedsBackup(true);
 	}
 	storage_setMnemonic(mnemonic_from_data(int_entropy, strength / 8));