diff --git a/firmware/2lib/2ui_screens.c b/firmware/2lib/2ui_screens.c
index 1b4c5e2..878b4ed 100644
--- a/firmware/2lib/2ui_screens.c
+++ b/firmware/2lib/2ui_screens.c
@@ -1123,6 +1123,11 @@
 						    int reset)
 {
 	const char *log_string = NULL;
+
+	/* Early return if the memory test is done. */
+	if (ui->state->test_finished)
+		return VB2_REQUEST_UI_CONTINUE;
+
 	vb2_error_t rv = op(reset, &log_string);
 	if ((rv && rv != VB2_ERROR_EX_DIAG_TEST_RUNNING) || !log_string) {
 		VB2_DEBUG("ERROR: Failed to retrieve memory test status\n");
@@ -1158,6 +1163,7 @@
 			    DIAGNOSTICS_MEMORY_ITEM_CANCEL);
 		if (ui->state->selected_item == DIAGNOSTICS_MEMORY_ITEM_CANCEL)
 			ui->state->selected_item = DIAGNOSTICS_MEMORY_ITEM_BACK;
+		ui->state->test_finished = 1;
 	}
 
 	return VB2_REQUEST_UI_CONTINUE;
diff --git a/firmware/2lib/include/2ui.h b/firmware/2lib/include/2ui.h
index 44e24fd..77c5acf 100644
--- a/firmware/2lib/include/2ui.h
+++ b/firmware/2lib/include/2ui.h
@@ -78,6 +78,9 @@
 	uint32_t page_count;
 	uint32_t current_page;
 
+	/* For memory check screen. */
+	int test_finished;  /* Do not update screen if the content is done */
+
 	struct vb2_screen_state *prev;
 };