diff --git a/grub-core/commands/search.c b/grub-core/commands/search.c
index 16143a34c..440303a4e 100644
--- a/grub-core/commands/search.c
+++ b/grub-core/commands/search.c
@@ -210,10 +210,10 @@ try (struct search_ctx *ctx)
       /* Cache entry was outdated. Remove it.  */
       if (!ctx->count)
 	{
+	  *prev = cache_ent->next;
 	  grub_free (cache_ent->key);
 	  grub_free (cache_ent->value);
 	  grub_free (cache_ent);
-	  *prev = cache_ent->next;
 	}
     }