diff --git a/grub-core/commands/gptprio.c b/grub-core/commands/gptprio.c
index 25f867a81..a439552e1 100644
--- a/grub-core/commands/gptprio.c
+++ b/grub-core/commands/gptprio.c
@@ -91,9 +91,8 @@ grub_find_next (const char *disk_name,
   if (!gpt)
     goto done;
 
-  if (!grub_gpt_both_valid(gpt))
-    if (grub_gpt_repair (dev->disk, gpt))
-      goto done;
+  if (grub_gpt_repair (dev->disk, gpt))
+    goto done;
 
   for (i = 0; (part = grub_gpt_get_partentry (gpt, i)) != NULL; i++)
     {
diff --git a/grub-core/lib/gpt.c b/grub-core/lib/gpt.c
index d52d1223f..c5100de2d 100644
--- a/grub-core/lib/gpt.c
+++ b/grub-core/lib/gpt.c
@@ -579,6 +579,10 @@ grub_gpt_repair (grub_disk_t disk, grub_gpt_t gpt)
 {
   grub_uint64_t backup_header, backup_entries;
 
+  /* Skip if there is nothing to do.  */
+  if (grub_gpt_both_valid (gpt))
+    return GRUB_ERR_NONE;
+
   grub_dprintf ("gpt", "repairing GPT for %s\n", disk->name);
 
   if (disk->log_sector_size != gpt->log_sector_size)