diff --git a/firmware/fsm.c b/firmware/fsm.c
index 4cd9babc5..6349fc664 100644
--- a/firmware/fsm.c
+++ b/firmware/fsm.c
@@ -234,6 +234,7 @@ void fsm_msgGetFeatures(GetFeatures *msg)
 	resp->has_imported = true; resp->imported = storage.has_imported && storage.imported;
 	resp->has_pin_cached = true; resp->pin_cached = session_isPinCached();
 	resp->has_passphrase_cached = true; resp->passphrase_cached = session_isPassphraseCached();
+	resp->has_needs_backup = true; resp->needs_backup = storage_needsBackup();
 	msg_write(MessageType_MessageType_Features, resp);
 }
 
diff --git a/firmware/reset.c b/firmware/reset.c
index ff2dd3918..89b62cf25 100644
--- a/firmware/reset.c
+++ b/firmware/reset.c
@@ -114,7 +114,7 @@ void reset_backup(void)
 		fsm_sendFailure(FailureType_Failure_UnexpectedMessage, _("Seed already backed up"));
 		return;
 	} else {
-		storage.has_needs_backup = false;
+		storage.has_needs_backup = true;
 		storage.needs_backup = false;
 		storage_commit();
 	}