diff --git a/cmd/gpt.c b/cmd/gpt.c
index 007a68eaa7..d0e165d539 100644
--- a/cmd/gpt.c
+++ b/cmd/gpt.c
@@ -786,10 +786,8 @@ static int gpt_setenv(struct blk_desc *desc, const char *name)
 
 		for (i = 1; i < part_drv->max_entries; i++) {
 			ret = part_drv->get_info(desc, i, &pinfo);
-			if (ret) {
-				/* no more entries in table */
-				break;
-			}
+			if (ret)
+				continue;
 
 			if (!strcmp(name, (const char *)pinfo.name)) {
 				/* match found, setup environment variables */